Merge pull request #630 from JetBrains/223-mb-initial

Compatibility with Rider 2022.3 snapshot

BuildPlugin

@@ -33,12 +33,12 @@ tc_open "Initializing build script"
 
     INJECT_INTELLIJ_VERSION=false
 
-    IJ_VERSION_MAJOR_BUILD=222
-    IJ_VERSION_MAJOR=2022.2
+    IJ_VERSION_MAJOR_BUILD=223
+    IJ_VERSION_MAJOR=2022.3
     IJ_VERSION_MINOR=
     IJ_VERSION_LATEST=$IJ_VERSION_MAJOR.$IJ_VERSION_MINOR \
                       && [[ -z $IJ_VERSION_MINOR ]] && IJ_VERSION_LATEST=$IJ_VERSION_MAJOR
-    IJ_SCALA_VERSION_LATEST=2022.2.2
+    IJ_SCALA_VERSION_LATEST=2022.3.1
 
     while getopts ":hqvBC:e:" option; do
         case $option in
@@ -58,7 +58,7 @@ tc_open "Initializing build script"
         esac
     done
 
-    BUILD_NUMBER="3.50.0.$BUILD_COUNTER-2022.2"
+    BUILD_NUMBER="3.50.0.$BUILD_COUNTER-2022.3"
     BUILD_CONFIGURATION=Release
 
     MAVEN_LOCAL_DIR="$SCRIPTPATH"/.repository

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

@@ -13,63 +13,6 @@ plugins {
     id "io.freefair.aspectj.post-compile-weaving" version "${aspectj_version}"
 }
 
-configurations {
-    compile.exclude module: 'slf4j-api'
-    compile.exclude module: 'log4j'
-    compile.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
-}
-
-dependencies {
-    compile 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8'
-    compile 'commons-io:commons-io:2.7'
-    compile group: 'org.apache.commons', name: 'commons-text', version: '1.8'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
-    compile 'net.minidev:json-smart:2.3'
-    compile 'com.microsoft.azure:azure-client-runtime:1.7.5', { force = true }
-    compile 'com.microsoft.azure:azure-client-authentication:1.7.5', { force = true }
-    aspect 'com.microsoft.azure:azure-toolkit-common-lib:0.3.0'
-    compile 'com.microsoft.azuretools:azuretools-core:3.50.0', {
-        exclude group: "com.microsoft.azure", module: "azure-client-authentication"
-        exclude group: "com.microsoft.azure", module: "azure-client-runtime"
-        exclude group: "javax.xml.bind", module: "jaxb-api"
-    }
-    compile 'com.microsoft.azuretools:azure-explorer-common:3.50.0', {
-        exclude group: "com.microsoft.azure", module: "azure-client-authentication"
-        exclude group: "com.microsoft.azure", module: "azure-client-runtime"
-        exclude group: "javax.xml.bind", module: "jaxb-api"
-    }
-    compile 'com.microsoft.azuretools:hdinsight-node-common:3.50.0', {
-        exclude group: "com.microsoft.azure", module: "azure-client-authentication"
-        exclude group: "com.microsoft.azure", module: "azure-client-runtime"
-        exclude group: "javax.xml.bind", module: "jaxb-api"
-    }
-    compile group: 'com.microsoft.azure', name: 'azure-auth-helper', version: '0.6.0'
-    compile 'com.microsoft.azure:azure-tools-common:0.10.0'
-    compile group: 'com.microsoft.azure.appplatform.v2020_07_01', name: 'azure-mgmt-appplatform', version: '1.0.0-beta'
-    compile group: 'org.dom4j', name: 'dom4j', version: '2.1.3', {
-        exclude group: "javax.xml.stream", module: "stax-api"
-        exclude group: "xpp3", module: "xpp3"
-        exclude group: "pull-parser", module: "pull-parser"
-        exclude group: "net.java.dev.msv", module: "xsdlib"
-    }
-    compile group: 'jaxen', name: 'jaxen', version: '1.2.0'
-    compile group: 'com.microsoft.azure.appplatform.v2019_05_01_preview', name: 'azure-mgmt-appplatform', version: '1.0.0-beta-2'
-    compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
-
-    compile "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"
-    compile "com.fasterxml.jackson.module:jackson-module-kotlin:${jackson_kotlin_version}"
-
-    compile group: 'com.jcraft', name: 'jsch', version: '0.1.55'
-    compile group: 'com.neovisionaries', name: 'nv-websocket-client', version: '2.9'
-    compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.23'
-
-    // https://mvnrepository.com/artifact/org.projectlombok/lombok
-    compileOnly "org.projectlombok:lombok:${lombok_version}"
-    annotationProcessor "org.projectlombok:lombok:${lombok_version}"
-
-    testImplementation "org.assertj:assertj-core:${assertj_version}"
-}
-
 allprojects {
     apply plugin: 'kotlin'
     apply plugin: 'java'
@@ -106,6 +49,7 @@ def mainProjects = [project(':'), project(':idea'), project(':rider')]
 
 configure(mainProjects) {
     apply plugin: 'org.jetbrains.intellij'
+    apply plugin: 'io.freefair.aspectj.post-compile-weaving'
 
     group 'com.microsoft.azuretools'
 
@@ -123,6 +67,66 @@ configure(mainProjects) {
         kotlinOptions.jvmTarget = javaVersion
     }
 
+    dependencies {
+        implementation "org.aspectj:aspectjtools:${aspectj_tools_version}"
+        implementation "org.aspectj:aspectjrt:${aspectj_tools_version}"
+        implementation 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8'
+        implementation 'commons-io:commons-io:2.7'
+        implementation group: 'org.apache.commons', name: 'commons-text', version: '1.8'
+        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
+        implementation 'net.minidev:json-smart:2.3'
+        implementation 'com.microsoft.azure:azure-client-runtime:1.7.5', { force = true }
+        implementation 'com.microsoft.azure:azure-client-authentication:1.7.5', { force = true }
+        aspect 'com.microsoft.azure:azure-toolkit-common-lib:0.3.0'
+        implementation 'com.microsoft.azuretools:azuretools-core:3.50.0', {
+            exclude group: "com.microsoft.azure", module: "azure-client-authentication"
+            exclude group: "com.microsoft.azure", module: "azure-client-runtime"
+            exclude group: "javax.xml.bind", module: "jaxb-api"
+        }
+        implementation 'com.microsoft.azuretools:azure-explorer-common:3.50.0', {
+            exclude group: "com.microsoft.azure", module: "azure-client-authentication"
+            exclude group: "com.microsoft.azure", module: "azure-client-runtime"
+            exclude group: "javax.xml.bind", module: "jaxb-api"
+        }
+        implementation 'com.microsoft.azuretools:hdinsight-node-common:3.50.0', {
+            exclude group: "com.microsoft.azure", module: "azure-client-authentication"
+            exclude group: "com.microsoft.azure", module: "azure-client-runtime"
+            exclude group: "javax.xml.bind", module: "jaxb-api"
+        }
+        implementation group: 'com.microsoft.azure', name: 'azure-auth-helper', version: '0.6.0'
+        implementation 'com.microsoft.azure:azure-tools-common:0.10.0'
+        implementation group: 'com.microsoft.azure.appplatform.v2020_07_01', name: 'azure-mgmt-appplatform', version: '1.0.0-beta'
+        implementation group: 'org.dom4j', name: 'dom4j', version: '2.1.3', {
+            exclude group: "javax.xml.stream", module: "stax-api"
+            exclude group: "xpp3", module: "xpp3"
+            exclude group: "pull-parser", module: "pull-parser"
+            exclude group: "net.java.dev.msv", module: "xsdlib"
+        }
+        implementation group: 'jaxen', name: 'jaxen', version: '1.2.0'
+        implementation group: 'com.microsoft.azure.appplatform.v2019_05_01_preview', name: 'azure-mgmt-appplatform', version: '1.0.0-beta-2'
+        implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
+
+        implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"
+        implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${jackson_kotlin_version}"
+
+        implementation group: 'com.jcraft', name: 'jsch', version: '0.1.55'
+        implementation group: 'com.neovisionaries', name: 'nv-websocket-client', version: '2.9'
+        implementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.23'
+
+        // https://mvnrepository.com/artifact/org.projectlombok/lombok
+        compileOnly "org.projectlombok:lombok:${lombok_version}"
+        annotationProcessor "org.projectlombok:lombok:${lombok_version}"
+
+        testImplementation "org.assertj:assertj-core:${assertj_version}"
+    }
+
+    configurations {
+        implementation.exclude module: 'slf4j-api'
+        implementation.exclude module: 'log4j'
+        implementation.exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+        implementation.exclude module: 'stax-api'
+    }
+
     tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
     intellij {
@@ -157,13 +161,17 @@ configure(mainProjects) {
         testLogging.exceptionFormat "full"
     }
 
+    tasks.named("processTestResources") {
+        duplicatesStrategy DuplicatesStrategy.INCLUDE
+    }
+
     buildSearchableOptions.onlyIf { false }
 }
 
 defaultTasks 'buildPlugin'
 
 wrapper {
-    gradleVersion = '6.9.2'
+    gradleVersion = '7.3'
     distributionType = Wrapper.DistributionType.ALL
     distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }

PluginsAndFeatures/azure-toolkit-for-intellij/buildSrc/build.gradle

@@ -10,7 +10,7 @@ repositories {
 apply plugin: 'groovy'
 
 dependencies {
-    compile localGroovy()
-    compile gradleApi()
+    implementation localGroovy()
+    implementation gradleApi()
 }
 

PluginsAndFeatures/azure-toolkit-for-intellij/buildspec/plugin/intellij/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11.0.3-jdk-slim-stretch
+FROM openjdk:17.0.1-jdk-slim
 LABEL maintainer="Sergey Dubov <[email protected]>"
 
 RUN mkdir -p /usr/share/man/man1
@@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         gpg \
         dirmngr \
         curl \
+        gpg-agent \
     && rm -rf /var/lib/apt/lists/*
 
 # Install dotnet-sdk 3.1. and 5.0
@@ -25,14 +26,15 @@ RUN wget -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor
 RUN apt-get update \
     && apt-get update \
     && apt-get install -y dotnet-sdk-3.1 \
-    && apt-get install -y dotnet-sdk-5.0
+    && apt-get install -y dotnet-sdk-5.0 \
+    && apt-get install -y dotnet-sdk-6.0
 
 # Install Mono
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
-&& echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
-&& apt-get update \
-&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-    mono-complete \
-    referenceassemblies-pcl \
-    msbuild \
-&& apt-get clean all
+    && echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
+       mono-complete \
+       referenceassemblies-pcl \
+       msbuild \
+    && apt-get clean all

PluginsAndFeatures/azure-toolkit-for-intellij/buildspec/tests/rider/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11.0.3-jdk-slim-stretch
+FROM openjdk:17.0.1-jdk-slim
 LABEL maintainer="Sergey Dubov <[email protected]>"
 
 ENV LOCAL_ENV_RUN=true
@@ -14,9 +14,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         gpg \
         dirmngr \
         curl \
+        gpg-agent \
     && rm -rf /var/lib/apt/lists/*
 
-# Install dotnet-sdk-5.0
+# Install dotnet-sdks
 RUN wget -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
     && mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
     && wget https://packages.microsoft.com/config/debian/9/prod.list \
@@ -32,10 +33,10 @@ RUN apt-get update \
 
 # Install Mono
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
-&& echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
-&& apt-get update \
-&& DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
-    mono-complete \
-    referenceassemblies-pcl \
-    msbuild \
-&& apt-get clean all
+    && echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
+       mono-complete \
+       referenceassemblies-pcl \
+       msbuild \
+    && apt-get clean all

PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties

@@ -1,35 +1,36 @@
-buildNumber=3.50.0.9999-2022.2
+buildNumber=3.50.0.9999-2022.3
 
-javaVersion=11
+javaVersion=17
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
 
-intellij_version=IC-222.3153-EAP-CANDIDATE-SNAPSHOT
-#rider_version=RD-2022.2-EAP9-SNAPSHOT
-rider_version=RD-2022.2
+intellij_version=IC-223.4884.69-EAP-SNAPSHOT
+rider_version=RD-2022.3-EAP1-SNAPSHOT
+#rider_version=RD-2022.3
 build_common_code_with=rider
 intellij_plugin_name=azure-toolkit-for-intellij
 rider_plugin_name=azure-toolkit-for-rider
 rider_backend_build_configuration=Debug
 
-dep_plugins=org.intellij.scala:2022.2.2
+dep_plugins=org.intellij.scala:2022.3.1
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 
 updateVersionRange=false
-patchPluginXmlSinceBuild=222
+patchPluginXmlSinceBuild=223
 
-kotlin_version=1.6.21
+kotlin_version=1.7.0
 # note: jackson_kotlin_version also needs updating in Utils\azuretools-core\pom.xml
-jackson_kotlin_version=2.13.2
-gradle_plugin_version=1.7.0
+jackson_kotlin_version=2.13.4
+gradle_plugin_version=1.9.0
 undercouch_version=4.0.4
 web_socket_version=1.5.1
 retrofit_version=2.9.0
 assertj_version=3.15.0
-lombok_version=1.18.8
-aspectj_version=5.3.0
+lombok_version=1.18.24
+aspectj_version=6.5.1
+aspectj_tools_version=1.9.9.1
 kotlin.stdlib.default.dependency=false
 
-rd_version=2022.2.5
+rd_version=2022.3.2
 
 rider_test_local_env_run=true

PluginsAndFeatures/azure-toolkit-for-intellij/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-7.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists