Upgrade to 2022.3v (#218)

shalom938 · MykolaYaremchuk · web-flow · commit 15780c9ca1ce · 2022-12-24T11:53:21.000+02:00
* Rider upgrade to v2022.3

* upgrade to 2022.3

* remove deprecated ProjectOpenedListener

* upgrade github workflows to use jdk 17

* filter listProductsReleases to release channel

* listProductsReleases release channel

* upgrade rider 2022.3.1

* upgrade resharper sdk to 2022.3.1

* implement new methods in ICodeInsightsProvider

* support only 223

* remove unnecessary gradle code

Co-authored-by: Mykola Yaremchuk &lt;myaremchuk@digma.ai&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
 
       - name: Setup dotnet
diff --git a/.github/workflows/gradle-ci-pr.yml b/.github/workflows/gradle-ci-pr.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
 
       - name: Setup dotnet
diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/gradle-ci.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
 
       - name: Setup dotnet
@@ -46,6 +46,19 @@ jobs:
           retention-days: 5
 
 
+      - name: Run Plugin Verifier
+        run: ./gradlew runPluginVerifier --no-daemon
+
+      - name: Collect Plugin Verifier Result
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: pluginVerifier-result
+          path: ${{ github.workspace }}/build/reports/pluginVerifier
+          retention-days: 5
+
+
+
       - name: Prepare Plugin Artifact
         id: artifact
         shell: bash
diff --git a/.github/workflows/multi-os-build.yml b/.github/workflows/multi-os-build.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
 
       - name: Setup dotnet
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
 
       - name: Setup dotnet
@@ -36,6 +36,8 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1.0.4
 
+      - name: Run Plugin Verifier
+        run: ./gradlew runPluginVerifier --no-daemon
 
       - name: Export Properties
         id: properties
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
@@ -40,7 +40,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
           cache: gradle
 
       # Run IDEA prepared for UI testing
diff --git a/.run/Run Plugin - Rider.run.xml b/.run/Run Plugin - Rider.run.xml
diff --git a/.run/Run Qodana.run.xml b/.run/Run Qodana.run.xml
@@ -9,12 +9,15 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="cleanInspections runInspections" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
-        <list />
+        <list>
+          <option value="cleanInspections" />
+          <option value="runInspections" />
+        </list>
       </option>
       <option name="vmOptions" />
     </ExternalSystemSettings>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,7 @@
 import common.properties
 import org.jetbrains.changelog.date
 import org.jetbrains.changelog.markdownToHTML
+import org.jetbrains.intellij.tasks.ListProductsReleasesTask
 import java.util.EnumSet
 
 fun properties(key: String) = properties(key,project)
@@ -167,16 +168,15 @@ tasks {
     // github fails with no space left on device for all versions
     listProductsReleases {
         types.set(listOf("RD","IC"))
-        sinceVersion.set("2022.2")
+        sinceVersion.set("2022.3")
         untilVersion.set("2022.3.*")
 //        sinceBuild.set("222.3739.36")
 //        untilBuild.set("222.4167.24")
-        releaseChannels.set(EnumSet.of(org.jetbrains.intellij.tasks.ListProductsReleasesTask.Channel.RELEASE))
+        releaseChannels.set(EnumSet.of(ListProductsReleasesTask.Channel.RELEASE))
     }
 
 
     runPluginVerifier {
-//        ideVersions.set(listOf())
         subsystemsToCheck.set("without-android")
     }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,20 +12,20 @@ repositories {
 
 dependencies {
     //Note: gradle-intellij-plugin 1.5.3 has some bugs with runIde that does not detect changes in kotlin UI DSL
-    implementation("org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.9.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
+    implementation("org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.11.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21")
     implementation("com.dorongold.plugins:task-tree:2.1.0")
     implementation("com.glovoapp.semantic-versioning:com.glovoapp.semantic-versioning.gradle.plugin:1.1.10")
 }
 
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
 kotlin {
     jvmToolchain {
-        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of("11"))
+        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of("17"))
     }
 }
 
@@ -59,4 +59,4 @@ tasks {
             }
         })
     }
-}
+}
diff --git a/buildSrc/src/main/kotlin/digma-base.gradle.kts b/buildSrc/src/main/kotlin/digma-base.gradle.kts
@@ -100,6 +100,7 @@ tasks {
 
     withType<JavaCompile> {
         options.compilerArgs.addAll(listOf("-Xlint:unchecked,deprecation"))
+        options.release.set(17)
     }
 
 
diff --git a/gradle.properties b/gradle.properties
@@ -6,14 +6,14 @@ pluginName=digma-intellij
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 # See https://www.jetbrains.com/intellij-repository/releases/
-pluginSinceBuild=222
+pluginSinceBuild=223
 pluginUntilBuild=223.*
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
-platformVersion=2022.2.3
+platformVersion=2022.3.1
 ### How to choose development instance:
 ## two properties control the development instance that runIde will execute:platformType and platformPlugins.
 ### for Rider
-## platformType=RD
+#platformType=RD
 ## platformPlugins=
 ### for Idea
 ## platformType=IC
@@ -32,7 +32,7 @@ platformPlugins=com.intellij.java
 #platformPlugins=
 
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 11
+javaVersion = 17
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 gradleVersion=7.5.1
diff --git a/ide-common/src/main/java/org/digma/intellij/plugin/common/Retries.java b/ide-common/src/main/java/org/digma/intellij/plugin/common/Retries.java
@@ -3,6 +3,7 @@
 import com.intellij.openapi.diagnostic.Logger;
 import org.digma.intellij.plugin.log.Log;
 
+@Deprecated(forRemoval = true)// we have no use for this class
 public class Retries {
 
     private Retries() {
diff --git a/ide-common/src/test/java/org/digma/intellij/plugin/test/RetriesTests.java b/ide-common/src/test/java/org/digma/intellij/plugin/test/RetriesTests.java
@@ -2,8 +2,11 @@
 
 import org.digma.intellij.plugin.common.Retries;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+@Deprecated(forRemoval = true) //we don't use Retries
+@Disabled
 class RetriesTests {
 
     private static class MyCounter{
diff --git a/python/build.gradle.kts b/python/build.gradle.kts
@@ -12,5 +12,5 @@ dependencies{
 intellij {
     version.set("IC-" + properties("platformVersion", project))
     //the python plugin version must be compatible with platformVersion
-    plugins.set(listOf("PythonCore:222.4167.37"))
+    plugins.set(listOf("PythonCore:223.7571.182"))
 }
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/BaseMethodInsightsProvider.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/BaseMethodInsightsProvider.cs
@@ -28,18 +28,19 @@ public bool IsAvailableIn(ISolution solution)
             return _solution == solution;
         }
 
-        public void OnClick(CodeInsightsHighlighting highlighting, ISolution solution)
+        public void OnClick(CodeInsightHighlightInfo highlightInfo, ISolution solution)
         {
-            Log(_logger, "OnClick invoked for {0}", highlighting.DeclaredElement.ShortName);
-            NavigateToMethod(highlighting);
+            Log(_logger, "OnClick invoked for {0}", highlightInfo.CodeInsightsHighlighting.DeclaredElement.ShortName);
+            NavigateToMethod(highlightInfo.CodeInsightsHighlighting);
         }
 
-        public void OnExtraActionClick(CodeInsightsHighlighting highlighting, string actionId, ISolution solution)
+        public void OnExtraActionClick(CodeInsightHighlightInfo highlightInfo, string actionId, ISolution solution)
         {
-            Log(_logger, "OnExtraActionClick invoked for {0}", highlighting.DeclaredElement);
-            NavigateToMethod(highlighting);
+            Log(_logger, "OnExtraActionClick invoked for {0}", highlightInfo.CodeInsightsHighlighting.DeclaredElement);
+            NavigateToMethod(highlightInfo.CodeInsightsHighlighting);
         }
 
+
         public abstract string ProviderId { get; }
         public abstract string DisplayName { get; }
 
diff --git a/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/ErrorHotspotMethodInsightsProvider.cs b/rider/Digma.Rider.Plugin/Digma.Rider/Highlighting/ErrorHotspotMethodInsightsProvider.cs
@@ -12,7 +12,7 @@ public class ErrorHotspotMethodInsightsProvider : BaseMethodInsightsProvider
         public ErrorHotspotMethodInsightsProvider(ISolution solution,ILogger logger,ShowToolWindowHost showToolWindowHost) 
             : base(solution,logger,showToolWindowHost)
         {}
-        
+
 
         public override string ProviderId => nameof(ErrorHotspotMethodInsightsProvider);
         public override string DisplayName => "Error Hotspot Method Hints";
diff --git a/rider/Digma.Rider.Plugin/Plugin.props b/rider/Digma.Rider.Plugin/Plugin.props
@@ -1,7 +1,7 @@
 ﻿<Project>
 
   <PropertyGroup>
-    <SdkVersion>2022.2.0</SdkVersion>
+    <SdkVersion>2022.3.1</SdkVersion>
 
     <Title>DigmaRiderPlugin</Title>
     <Description>Digma Rider Plugin</Description>
diff --git a/rider/build.gradle.kts b/rider/build.gradle.kts
@@ -34,16 +34,13 @@ intellij {
 
 tasks {
 
-    properties("javaVersion", project).let {
-        withType<JavaCompile> {
-            dependsOn(named("rdgen"))
-            options.release.set(it.toInt())
-        }
-        withType<KotlinCompile> {
-            dependsOn(named("rdgen"))
-            kotlinOptions.jvmTarget = it
-        }
+    withType<JavaCompile> {
+        dependsOn(named("rdgen"))
     }
+    withType<KotlinCompile> {
+        dependsOn(named("rdgen"))
+    }
+
 
 
     val setBuildTool = create("setBuildTool") {
diff --git a/rider/gradle.properties b/rider/gradle.properties
@@ -1,6 +1,6 @@
 # Any property can be overwritten from command-line via
 #   -P<propertyName>=<value>
-riderVersion=2022.2.4
+riderVersion=2022.3.1
 DotnetPluginId=Digma.Rider.Plugin
 DotnetSolution=Digma.Rider.Plugin.sln
 RiderPluginId=org.digma.rider.plugins
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -30,11 +30,12 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             //rdgen version is independent of rider version
-            version("rider-rdgen", "2022.2.6")
+            version("rider-rdgen", "2022.3.4")
             //kotlin stdlib is not packaged with the plugin because intellij platform already contains it.
             //it's necessary for compilation in some cases for example rider protocol module.
             //it must target the lowest bundled stdlib version of the platform we support
-            version("kotlin-stdlib", "1.6.20")
+            //see: https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#adding-kotlin-support
+            version("kotlin-stdlib", "1.6.21")
             library("kotlin-stdlib-jdk8", "org.jetbrains.kotlin", "kotlin-stdlib-jdk8").versionRef("kotlin-stdlib")
             library("guava", "com.google.guava", "guava").version("31.1-jre")
             version("retrofit", "2.9.0")
diff --git a/src/main/java/org/digma/intellij/plugin/project/ProjectOpenedListener.java b/src/main/java/org/digma/intellij/plugin/project/ProjectOpenedListener.java
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -90,9 +90,6 @@
 
 
     <projectListeners>
-        <listener
-                class="org.digma.intellij.plugin.project.ProjectOpenedListener"
-                topic="com.intellij.openapi.project.ProjectManagerListener"/>
         <listener
                 class="org.digma.intellij.plugin.emvironment.EnvironmentChangeHandler"
                 topic="org.digma.intellij.plugin.analytics.EnvironmentChanged"/>

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,20 @@ repositories {`
`12`	`12`
`13`	`13`	`dependencies {`
`14`	`14`	`//Note: gradle-intellij-plugin 1.5.3 has some bugs with runIde that does not detect changes in kotlin UI DSL`
`15`		`- implementation("org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.9.0")`
`16`		`- implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")`
	`15`	`+ implementation("org.jetbrains.intellij.plugins:gradle-intellij-plugin:1.11.0")`
	`16`	`+ implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21")`
`17`	`17`	`implementation("com.dorongold.plugins:task-tree:2.1.0")`
`18`	`18`	`implementation("com.glovoapp.semantic-versioning:com.glovoapp.semantic-versioning.gradle.plugin:1.1.10")`
`19`	`19`	`}`
`20`	`20`
`21`	`21`
`22`	`22`	`java {`
`23`		`- toolchain.languageVersion.set(JavaLanguageVersion.of(11))`
	`23`	`+ toolchain.languageVersion.set(JavaLanguageVersion.of(17))`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`kotlin {`
`27`	`27`	`jvmToolchain {`
`28`		`- (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of("11"))`
	`28`	`+ (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of("17"))`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -59,4 +59,4 @@ tasks {`
`59`	`59`	`}`
`60`	`60`	`})`
`61`	`61`	`}`
`62`		`-}`
	`62`	`+}`