From 4fbf20288fb396c0a7cfa060c95942fa1859ab37 Mon Sep 17 00:00:00 2001 From: kigawa Date: Tue, 26 Aug 2025 04:17:09 +0900 Subject: [PATCH] Set platform-specific artifact IDs in Maven publishing for `renlin-kotlin-plugin` to avoid conflicts; update build workflow to cache Gradle and adjust plugin artifact ID for JVM. --- .github/workflows/deploy-maven-central.yml | 1 + .../kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt | 2 +- kotlin-plugin/build.gradle.kts | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-maven-central.yml b/.github/workflows/deploy-maven-central.yml index 6c54b8b..9539c52 100644 --- a/.github/workflows/deploy-maven-central.yml +++ b/.github/workflows/deploy-maven-central.yml @@ -25,6 +25,7 @@ jobs: with: java-version: '17' distribution: 'temurin' + cache: 'gradle' - name: Determine version from branch id: version diff --git a/gradle-plugin/src/main/kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt b/gradle-plugin/src/main/kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt index fcd2861..a7ba862 100644 --- a/gradle-plugin/src/main/kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt +++ b/gradle-plugin/src/main/kotlin/net/kigawa/renlin/RenlinCompilerPlugin.kt @@ -49,7 +49,7 @@ class RenlinCompilerPlugin : KotlinCompilerPluginSupportPlugin { override fun getPluginArtifact(): SubpluginArtifact { return SubpluginArtifact( groupId = "net.kigawa.renlin-compiler", - artifactId = "renlin-kotlin-plugin", + artifactId = "renlin-kotlin-plugin-jvm", version = "1.3.0", ) } diff --git a/kotlin-plugin/build.gradle.kts b/kotlin-plugin/build.gradle.kts index befde4e..e718a3c 100644 --- a/kotlin-plugin/build.gradle.kts +++ b/kotlin-plugin/build.gradle.kts @@ -75,8 +75,15 @@ kotlin { publishing { // Configure all publications publications.withType { + // Set platform-specific artifact IDs to avoid conflicts + when (name) { + "jvm" -> artifactId = "renlin-kotlin-plugin-jvm" + "js" -> artifactId = "renlin-kotlin-plugin-js" + "kotlinMultiplatform" -> artifactId = "renlin-kotlin-plugin" + else -> artifactId = "renlin-kotlin-plugin-$name" + } + pom { - artifactId = "renlin-kotlin-plugin" name.set("net.kigawa.renlin-compiler.gradle.plugin") description.set("Kotlin Compiler Plugin for automatic value injection with @AutoFill annotation") url.set("https://github.com/Code-Sakura/renlin-compiler")