Change artifactId for platform specific part

+ use proper ide version in sample
JetBrains · Oct 10, 2023 · 02c8130 · 02c8130
1 parent f96dedd
commit 02c8130
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/buildSrc/src/main/kotlin/jewel-publish.gradle.kts b/buildSrc/src/main/kotlin/jewel-publish.gradle.kts
@@ -1,5 +1,8 @@
 @file:Suppress("UnstableApiUsage")
 
+import SupportedIJVersion.IJ_232
+import SupportedIJVersion.IJ_233
+
 plugins {
     kotlin("jvm")
     `maven-publish`
@@ -33,7 +36,11 @@ publishing {
             from(components["kotlin"])
             artifact(javadocJar)
             artifact(sourcesJar)
-            version = project.version.toString()
+            val ijVersionRaw = when (supportedIJVersion()) {
+                IJ_232 -> "232"
+                IJ_233 -> "233"
+            }
+            version = "${project.version}-ij-$ijVersionRaw"
             artifactId = "jewel-${project.name}"
             pom {
                 name = "Jewel"

diff --git a/ide-laf-bridge/ide-laf-bridge-232/build.gradle.kts b/ide-laf-bridge/ide-laf-bridge-232/build.gradle.kts
@@ -10,5 +10,6 @@ dependencies {
 }
 
 tasks.withType<AbstractPublishToMaven>().configureEach {
+    publication.artifactId = "jewel-ide-laf-bridge-platform-specific"
     enabled = supportedIJVersion() == SupportedIJVersion.IJ_232
 }
diff --git a/ide-laf-bridge/ide-laf-bridge-233/build.gradle.kts b/ide-laf-bridge/ide-laf-bridge-233/build.gradle.kts
@@ -10,5 +10,6 @@ dependencies {
 }
 
 tasks.withType<AbstractPublishToMaven>().configureEach {
+    publication.artifactId = "jewel-ide-laf-bridge-platform-specific"
     enabled = supportedIJVersion() == SupportedIJVersion.IJ_233
 }
diff --git a/samples/ide-plugin/build.gradle.kts b/samples/ide-plugin/build.gradle.kts
@@ -1,3 +1,5 @@
+import SupportedIJVersion.*
+
 plugins {
     jewel
     alias(libs.plugins.composeDesktop)
@@ -7,7 +9,11 @@ plugins {
 intellij {
     pluginName.set("Jewel Demo")
     plugins.set(listOf("org.jetbrains.kotlin"))
-    version.set("2023.2.1")
+    val versionRaw = when (supportedIJVersion()) {
+        IJ_232 -> libs.versions.idea232.get()
+        IJ_233 -> libs.versions.idea233.get()
+    }
+    version.set(versionRaw)
 }
 
 // TODO remove this once the IJ Gradle plugin fixes their repositories bug