Fix merge

ellizio · Nov 14, 2024 · d7902de · d7902de
1 parent ba4e6ea
commit d7902de
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,6 @@ import com.jetbrains.plugin.structure.base.utils.isFile
 import groovy.ant.FileNameFinder
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.jetbrains.intellij.platform.gradle.Constants
-import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import java.io.ByteArrayOutputStream
 
 plugins {
@@ -83,7 +82,13 @@ intellijPlatform {
         ides {
             ides(listOf(
                 "RD-2024.2",
-                "RD-2024.2.1"
+                "RD-2024.2.1",
+                "RD-2024.2.2",
+                "RD-2024.2.3",
+                "RD-2024.2.4",
+                "RD-2024.2.5",
+                "RD-2024.2.6",
+                "RD-2024.2.7"
             ))
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.ODataCliUi
 DotnetSolution=ReSharperPlugin.ODataCliUi.sln
 RiderPluginId=ru.ellizio.odatacliui
-PluginVersion=1.2.0-2024.2
+PluginVersion=1.2.0
 
 BuildConfiguration=Debug
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin = "1.9.24" # 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"
+gradleJvmWrapper = "0.14.0" # https://github.com/mfilippov/gradle-jvm-wrapper
 
 [libraries]
 kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }