Merge pull request #677 from JetBrains/231.ra/231-release

Target Rider 2023.1
JetBrains · Apr 11, 2023 · f51b023 · f51b023
2 parents e06f879 + 8f868e1
commit f51b023
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 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=2023.1.3
+    IJ_SCALA_VERSION_LATEST=2023.1.15
 
     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
@@ -113,6 +113,8 @@ configure(mainProjects) {
         implementation group: 'com.neovisionaries', name: 'nv-websocket-client', version: '2.9'
         implementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.23'
 
+        implementation group: 'org.apache.maven', name: 'apache-maven', version: '3.9.0'
+
         // https://mvnrepository.com/artifact/org.projectlombok/lombok
         compileOnly "org.projectlombok:lombok:${lombok_version}"
         annotationProcessor "org.projectlombok:lombok:${lombok_version}"

diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
@@ -5,14 +5,14 @@ org.gradle.jvmargs='-Duser.language=en'
 sources=false
 
 intellij_version=IC-231.8109-EAP-CANDIDATE-SNAPSHOT
-rider_version=RD-2023.1-EAP9-SNAPSHOT
-#rider_version=RD-2022.3.1
+#rider_version=RD-2023.1-EAP9-SNAPSHOT
+rider_version=RD-2023.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:2023.1.11
+dep_plugins=org.intellij.scala:2023.1.15
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 
 updateVersionRange=false

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-2023.1]</p>
         <ul>
-          <li>Compatibility with Rider 2023.1 EAP9</li>
+          <li>Compatibility with Rider 2023.1</li>
           <li>Azure Functions: Option to auto-start Azurite with run configurations (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/674">#674</a>)</li>
           <li>Azure Functions: show a warning when Azurite is not running (<a href="https://github.com/JetBrains/azure-tools-for-intellij/issues/605">#650</a>)</li>
           <li>Azure Functions: Support Windows arm64 Azure Core Tools (<a href="https://youtrack.jetbrains.com/issue/RIDER-85548">#RIDER-85548</a>)</li>