Update supported IntelliJ version range to 2019.1–2020.2

README.md

@@ -2,7 +2,7 @@
 
 This is a plugin for working with Git and TFVC repositories on Azure DevOps and Team Foundation Server (TFS) 2015+ inside IntelliJ, Android Studio, 
 and various other JetBrains IDEs. It is supported on Linux, Mac OS X, and Windows.
-It is compatible with IntelliJ IDEA Community and Ultimate editions (version 2018.3+) and Android Studio (version 3.4+).
+It is compatible with IntelliJ IDEA Community and Ultimate editions (version 2019.1+) and Android Studio (version 3.5+).
 
 To learn more about installing and using our Azure DevOps IntelliJ plug-in, visit: https://docs.microsoft.com/en-us/azure/devops/java/download-intellij-plug-in
 

gradle.properties

@@ -1,4 +1,4 @@
 buildNumber=1.161.0
-ideaVersion=2018.3
+ideaVersion=2019.1
 
 kotlin.code.style=official

plugin/resources/META-INF/plugin.xml

@@ -47,7 +47,7 @@
       <br />
       <i>Compiled with Java 8</i>
       <br />
-      <i>Compatible with IntelliJ Ultimate and Community editions versions 2018.3 and later and Android Studio 3.4 and later</i>
+      <i>Compatible with IntelliJ Ultimate and Community editions versions 2019.1 and later and Android Studio 3.5 and later</i>
       <br />
       <br />
       <b>End User License Agreement & Privacy Policy</b>

plugin/src/com/microsoft/alm/plugin/external/reactive/ReactiveTfvcClientHolder.java

@@ -29,8 +29,6 @@ public class ReactiveTfvcClientHolder implements Disposable {
     }
 
     public static Path getClientBackendPath() {
-        // TODO: Replace with PluginManagerCore.getPlugin after migration to IDEA 2019.3
-        //noinspection UnstableApiUsage
         return Paths.get(
                 Objects.requireNonNull(PluginManager.getPlugin(IdeaHelper.PLUGIN_ID)).getPath().getAbsolutePath(),
                 "backend");

plugin/src/com/microsoft/alm/plugin/idea/tfvc/actions/SingleItemAction.java

@@ -121,7 +121,7 @@ public abstract class SingleItemAction extends DumbAwareAction {
                 || !getAllowedStatuses().contains(FileStatusManager.getInstance(project).getStatus(file)))
             return false;
 
-        // TODO: Remove this suppression after migration to IDEA 2019.1. AbstractVcs became non-generic in newer IDEA.
+        // TODO: Remove this suppression after migration to IDEA 2019.3. AbstractVcs became non-generic in newer IDEA.
         @SuppressWarnings("rawtypes") AbstractVcs vcs = VcsUtil.getVcsFor(project, file);
         return vcs != null && TFSVcs.getKey().equals(vcs.getKeyInstanceMethod());
     }

plugin/src/com/microsoft/alm/plugin/idea/tfvc/core/TfvcIntegrationEnabler.java

@@ -64,16 +64,14 @@ public class TfvcIntegrationEnabler extends VcsIntegrationEnabler {
         myVcs = vcs;
     }
 
-    // TODO: Fix the generic signatures in this method after migration to IDEA 2019.1. Currently this is crippled due to
-    // IDEA 2018.3 compatibility.
-    @SuppressWarnings("unchecked")
     @Override
-    public void enable(@NotNull Collection vcsRoots) {
+    public void enable(@NotNull Collection<? extends VcsRoot> vcsRoots) {
         // This override does the same as base method, but tries to determine a workspace directory instead of using
         // project.getBaseDir().
-        Collection<VcsRoot> typedRoots = (Collection<VcsRoot>)vcsRoots;
-        Collection<VirtualFile> existingRoots = typedRoots.stream().filter(root -> {
-            AbstractVcs vcs = root.getVcs();
+        Collection<VirtualFile> existingRoots = vcsRoots.stream().filter(root -> {
+            // TODO: Remove this suppression after migration to IDEA 2019.3. AbstractVcs became non-generic in newer
+            // IDEA.
+            @SuppressWarnings("rawtypes") AbstractVcs vcs = root.getVcs();
             return vcs != null && vcs.getName().equals(myVcs.getName());
         }).map(VcsRoot::getPath).collect(toList());
 

plugin/src/com/microsoft/alm/plugin/idea/tfvc/tfignore/TfIgnoreLanguage.java

@@ -5,7 +5,7 @@ package com.microsoft.alm.plugin.idea.tfvc.tfignore;
 
 import com.intellij.lang.Language;
 
-public class TfIgnoreLanguage extends Language { // TODO: Inherit from IgnoreLanguage if we target IDEA 2019.*
+public class TfIgnoreLanguage extends Language {
     public static TfIgnoreLanguage INSTANCE = new TfIgnoreLanguage();
     private TfIgnoreLanguage() {
         super("TFIgnore");

vsts-ci.yml

@@ -101,5 +101,5 @@ jobs:
         displayName: Gradle compile
         inputs:
           jdkVersionOption: 1.8
-          options: '--info -PideaVersion=2020.1'
+          options: '--info -PideaVersion=2020.2'
           tasks: :plugin:compileJava