Merge pull request #647 from JetBrains/223-mb-eap8

Target Rider 2022.3.1
JetBrains · Dec 21, 2022 · d0cb2b8 · d0cb2b8
2 parents cc9d054 + e6517c9
commit d0cb2b8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/BuildPlugin b/BuildPlugin
@@ -38,7 +38,7 @@ tc_open "Initializing build script"
     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.3.1
+    IJ_SCALA_VERSION_LATEST=2022.3.8
 
     while getopts ":hqvBC:e:" option; do
         case $option in

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle
@@ -72,7 +72,7 @@ configure(mainProjects) {
         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-text', version: '1.10.0'
         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 }

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
@@ -4,15 +4,15 @@ javaVersion=17
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
 
-intellij_version=IC-223.6646.99-EAP-SNAPSHOT
-rider_version=RD-2022.3-EAP5-SNAPSHOT
-#rider_version=RD-2022.3
+intellij_version=IC-223.7401.7-EAP-SNAPSHOT
+#rider_version=RD-2022.3-EAP8-SNAPSHOT
+rider_version=RD-2022.3.1
 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.3.1
+dep_plugins=org.intellij.scala:2022.3.8
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 
 updateVersionRange=false
@@ -21,8 +21,7 @@ patchPluginXmlSinceBuild=223
 kotlin_version=1.7.0
 # note: jackson_kotlin_version also needs updating in Utils\azuretools-core\pom.xml
 jackson_kotlin_version=2.13.4
-# TODO: drop the SNAPSNOT after 1.10.0 gets released.
-gradle_plugin_version=1.10.0-SNAPSHOT
+gradle_plugin_version=1.10.0
 undercouch_version=4.0.4
 web_socket_version=1.5.1
 retrofit_version=2.9.0
@@ -32,6 +31,6 @@ aspectj_version=6.5.1
 aspectj_tools_version=1.9.9.1
 kotlin.stdlib.default.dependency=false
 
-rd_version=2022.3.2
+rd_version=2022.3.4
 
 rider_test_local_env_run=true
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
@@ -6,7 +6,7 @@
     <html>
         <h4>Added:</h4>
         <ul>
-          <li>Compatibility with Rider 2022.3 EAP 5</li>
+          <li>Compatibility with Rider 2022.3</li>
           <li>Azure Functions: Add F# item templates for isolated worker (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/635">#635</a>)</li>
         </ul>
         <h4>Fixed bugs:</h4>

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
@@ -25,7 +25,7 @@
       <html>
         <p>[3.50.0-2022.3]</p>
         <ul>
-          <li>Compatibility with Rider 2022.3 EAP 5</li>
+          <li>Compatibility with Rider 2022.3</li>
           <li>Azure Functions: Add F# item templates for isolated worker (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/635">#635</a>)</li>
         </ul>
         <h4>Fixed bugs:</h4>