Downgrade to 2024.1

ellizio · Aug 21, 2024 · 82cd590 · 82cd590
1 parent 1642699
commit 82cd590
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/.idea/runConfigurations/Rider.xml b/.idea/runConfigurations/Rider.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -69,16 +69,21 @@ sourceSets {
 }
 
 tasks.compileKotlin {
-    kotlinOptions { jvmTarget = "21" }
+    kotlinOptions { jvmTarget = "17" }
 }
 
 intellijPlatform {
     pluginVerification {
         cliPath = File("/libs/verifier-cli-1.373-all.jar") // https://github.com/JetBrains/intellij-plugin-verifier
         ides {
             ides(listOf(
-                "RD-2024.2",
-                "RD-2024.2.1"
+                "RD-2024.1",
+                "RD-2024.1.1",
+                "RD-2024.1.2",
+                "RD-2024.1.3",
+                "RD-2024.1.4",
+                "RD-2024.1.5",
+                "RD-2024.1.6"
             ))
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ PublishToken="_PLACEHOLDER_"
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-ProductVersion=2024.2
+ProductVersion=2024.1
 
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
 # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.24" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+kotlin = "1.8.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
 rdGen = "2024.1.1" # https://github.com/JetBrains/rd/releases
 intellijPlatform = "2.0.1" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
 gradleJvmWrapper = "0.14.0" # https://github.com/JetBrains/intellij-platform-gradle-plugin/releases

diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.jetbrains.rd.generator.gradle.RdGenTask
+import java.util.*
 
 plugins {
     alias(libs.plugins.kotlinJvm)
@@ -23,7 +24,7 @@ val RiderPluginId: String by rootProject
 
 rdgen {
     val csOutput = File(rootDir, "src/dotnet/${DotnetPluginId}/Rider")
-    val ktOutput = File(rootDir, "src/rider/main/kotlin/${RiderPluginId.replace('.','/').toLowerCase()}")
+    val ktOutput = File(rootDir, "src/rider/main/kotlin/${RiderPluginId.replace('.','/').lowercase(Locale.getDefault())}")
     verbose = true
     packages = "model.rider"
 

diff --git a/src/dotnet/Plugin.props b/src/dotnet/Plugin.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- See https://www.nuget.org/packages/JetBrains.ReSharper.SDK -->
     <!-- Keep in sync with ProductVersion in gradle.properties -->
-    <SdkVersion>2024.2.0</SdkVersion>
+    <SdkVersion>2024.1.0</SdkVersion>
 
     <Title>OData CLI UI</Title>
     <Description>Description</Description>

diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml
@@ -3,7 +3,7 @@
   <name>OData CLI UI</name>
   <version>_PLACEHOLDER_</version>
   <vendor url="https://github.com/ellizio/odata-cli-ui">ellizio</vendor>
-  <idea-version since-build="242" until-build="242.*" />
+  <idea-version since-build="241" until-build="241.*" />
   <depends>com.intellij.modules.rider</depends>
   <depends>org.jetbrains.plugins.terminal</depends>
   <resource-bundle>UiBundle</resource-bundle>