Support separate RD and IC versions

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+### [1.0.4]
+### Changed
+- Updated configuration to support IDEA 2023.1
+
 ## [1.0.3]
 ### Fixed
 - Fixed tests not being discovered in multi-project setup in Rider

build.gradle.kts

@@ -6,9 +6,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 val pluginNameProp = prop("pluginName")
 val pluginVersionProp = prop("pluginVersion")
 val pluginGroupProp = prop("pluginGroup")
-val platformVersionProp = prop("platformVersion")
+val riderPlatformVersionProp = prop("riderPlatformVersion")
+val ideaPlatformVersionProp = prop("ideaPlatformVersion")
 val pluginSinceBuildProp = prop("pluginSinceBuild")
 val pluginUntilBuildProp = prop("pluginUntilBuild")
+val projectType = System.getenv("IDE_TYPE") ?: "IC"
 
 
 plugins {
@@ -43,7 +45,11 @@ allprojects {
     }
 
     intellij {
-        version.set(platformVersionProp)
+        if (projectType == "RD") {
+            version.set("RD-$riderPlatformVersionProp")
+        } else {
+            version.set("IC-$ideaPlatformVersionProp")
+        }
     }
 
     tasks {
@@ -142,6 +148,7 @@ project(":plugin") {
         patchPluginXml {
             version.set(pluginVersionProp)
             sinceBuild.set(pluginSinceBuildProp)
+            if (pluginUntilBuildProp.isNotEmpty())
                 untilBuild.set(pluginUntilBuildProp)
 
             // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
@@ -181,6 +188,10 @@ project(":idea") {
         plugins.set(listOf("JUnit", "com.intellij.java"))
     }
 
+    intellij {
+        version.set(ideaPlatformVersionProp)
+    }
+
     dependencies {
         implementation(project(":common"))
         implementation(files("libs/ComTest_v1.jar"))
@@ -193,6 +204,10 @@ project(":rider") {
         type.set("RD")
     }
 
+    intellij {
+        version.set(riderPlatformVersionProp)
+    }
+
     dependencies {
         implementation(project(":common"))
         implementation(files("libs/ComTest_v2.jar"))

gradle.properties

@@ -3,14 +3,15 @@
 pluginGroup = fi.jyu.rider.comtest
 pluginName = ComTest Runner
 # SemVer format -> https://semver.org
-pluginVersion = 1.0.3
+pluginVersion = 1.0.4
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 222
-pluginUntilBuild = 223.*
+pluginUntilBuild =
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension
-platformVersion = 2022.3.2
+riderPlatformVersion = 2022.3.3
+ideaPlatformVersion = 2023.1
 
 # Opt-out flag for bundling Kotlin standard library -> https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
 # suppress inspection "UnusedProperty"