Decouple Kotlin plugin version from Ktorfit version (#732)

Foso · Nov 10, 2024 · c64072c · c64072c
2 parents 25cd7a5 + 2f67832
commit c64072c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitCompilerSubPlugin.kt b/...gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitCompilerSubPlugin.kt
@@ -3,7 +3,7 @@ package de.jensklingenberg.ktorfit.gradle
 import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.ARTIFACT_NAME
 import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.COMPILER_PLUGIN_ID
 import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.GROUP_NAME
-import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.KTORFIT_VERSION
+import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.KTORFIT_COMPILER_PLUGIN_VERSION
 import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.MIN_KOTLIN_VERSION
 import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.SNAPSHOT
 import org.gradle.api.Project
@@ -46,7 +46,7 @@ internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
         return SubpluginArtifact(
             groupId = GROUP_NAME,
             artifactId = ARTIFACT_NAME,
-            version = "${KTORFIT_VERSION}-${myproject.kotlinExtension.compilerVersion.get()}$SNAPSHOT",
+            version = "${KTORFIT_COMPILER_PLUGIN_VERSION}-${myproject.kotlinExtension.compilerVersion.get()}$SNAPSHOT",
         )
     }
 

diff --git a/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt b/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt
@@ -16,7 +16,8 @@ class KtorfitGradlePlugin : Plugin<Project> {
         const val GROUP_NAME = "de.jensklingenberg.ktorfit"
         const val ARTIFACT_NAME = "compiler-plugin"
         const val COMPILER_PLUGIN_ID = "ktorfitPlugin"
-        const val KTORFIT_VERSION = "2.1.0" // remember to bump this version before any release!
+        const val KTORFIT_KSP_PLUGIN_VERSION = "2.1.0" // remember to bump this version before any release!
+        const val KTORFIT_COMPILER_PLUGIN_VERSION = "2.1.0"
         const val SNAPSHOT = ""
         const val MIN_KSP_VERSION = "1.0.24"
         const val MIN_KOTLIN_VERSION = "2.0.0"
@@ -78,7 +79,7 @@ class KtorfitGradlePlugin : Plugin<Project> {
                         }
                     }
                 }
-                val dependency = "$ktorfitKsp:$KTORFIT_VERSION-$kspVersion$SNAPSHOT"
+                val dependency = "$ktorfitKsp:$KTORFIT_KSP_PLUGIN_VERSION-$kspVersion$SNAPSHOT"
 
                 when (val kotlinExtension = kotlinExtension) {
                     is KotlinSingleTargetExtension<*> -> {