Restructure versioning numbers (#799)

Author: Foso

docs/CHANGELOG.md

@@ -9,10 +9,22 @@ But there is no intent to bump the Ktorfit major version for every KSP update.
 
 # Unreleased
 
+Unreleased
+========================================
+* Supported KSP version: 1.0.28
+* Supported Kotlin version: 2.1.10
+* Ktor version: 3.1.0
+
 ## Added
 - Add KSP2 support
 - Add watchosDeviceArm64 target
 
+# Changed
+- Changed internal versioning numbers of the Ktorfit KSP and compiler plugin. 
+With that change Ktorfit only needs to be updated when a new KSP / Kotlin version introduces breaking changes in the API and not for every minor update.
+This is also the reason why this version has KSP min version 1.0.28 even though the last Ktorfit version has 1.0.30
+
+
 # [2.3.0]()
 
 2.3.0 - 2025-02-16

example/AndroidOnlyExample/app/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("com.google.devtools.ksp") version "2.1.10-1.0.30"
-    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.21"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0"
     id("de.jensklingenberg.ktorfit") version "2.3.0"
     id("org.jetbrains.kotlin.plugin.compose") version "2.1.10"
 }

example/AndroidOnlyExample/gradle.properties

@@ -21,4 +21,5 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.nonFinalResIds=false
+android.nonFinalResIds=false
+#ksp.useKSP2=true

example/MultiplatformExample/gradle.properties

@@ -7,3 +7,4 @@ android.useAndroidX=true
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
+#ksp.useKSP2=true

example/MultiplatformExample/person/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 version = "1.0"
-val ktorVersion = "2.3.11"
+val ktorVersion = "3.1.0"
 
 kotlin {
     jvmToolchain(8)

example/MultiplatformExample/shared/build.gradle.kts

@@ -11,7 +11,6 @@ plugins {
 
 ktorfit {
     errorCheckingMode = ErrorCheckingMode.ERROR
-    generateQualifiedTypeName = false
 }
 
 version = "1.0"

gradle/libs.versions.toml

@@ -8,23 +8,23 @@ junit = "4.13.2"
 kctfork = "0.7.0"
 kotlin = "2.1.10"
 kotlinPoet = "2.0.0"
-kspVersion = "2.1.10-1.0.30"
+kspVersion = "2.1.10-1.0.29"
 
 groupId = "de.jensklingenberg.ktorfit"
 ktorfit = "2.3.0"
-ktorfitKsp = "2.3.0-1.0.30"
-ktorfitCompiler = "2.1.0-2.1.10"
+ktorfitKsp = "2.4.0"
+ktorfitCompiler = "2.2.0" #Don't confuse this with the Kotlin version
 ktorfitCallConverter = "2.3.0"
 ktorfitFlowConverter = "2.3.0"
 ktorfitResponseConverter = "2.3.0"
-ktorfitGradle = "2.3.0"
+ktorfitGradle = "2.4.0"
 
-ktorfitGradlePlugin = "2.3.0"
+ktorfitGradlePlugin = "2.2.0"
 ktorVersion = "3.1.0"
 mockk = "1.13.16"
 mockito-kotlin = "4.1.0"
 gradleMavenPublishPlugin = "0.28.0"
-vannikMavenPublish = "0.30.0"
+vannikMavenPublish = "0.28.0"
 licensee = "1.12.0"
 
 [libraries]

ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitCompilerSubPlugin.kt

@@ -6,7 +6,6 @@ import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.GRADLE_TA
 import de.jensklingenberg.ktorfit.gradle.KtorfitGradlePlugin.Companion.GROUP_NAME
 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
 import org.gradle.api.provider.Provider
 import org.jetbrains.kotlin.buildtools.api.ExperimentalBuildToolsApi
@@ -18,7 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 
 internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
-    private lateinit var myproject: Project
+    private lateinit var myProject: Project
 
     override fun applyToCompilation(kotlinCompilation: KotlinCompilation<*>): Provider<List<SubpluginOption>> {
         return kotlinCompilation.target.project.provider {
@@ -30,14 +29,14 @@ internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
     }
 
     override fun apply(target: Project) {
-        myproject = target
+        myProject = target
     }
 
     override fun getCompilerPluginId(): String = COMPILER_PLUGIN_ID
 
     override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean {
         val kotlinVersion =
-            myproject.ktorfitExtension(
+            myProject.ktorfitExtension(
                 GRADLE_TASKNAME
             ).kotlinVersion.get()
 
@@ -46,16 +45,16 @@ internal class KtorfitCompilerSubPlugin : KotlinCompilerPluginSupportPlugin {
 
     @OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalBuildToolsApi::class)
     override fun getPluginArtifact(): SubpluginArtifact {
+        checkKotlinVersion(myProject.kotlinExtension.compilerVersion.get())
         val compilerVersion =
-            myproject.ktorfitExtension(
+            myProject.ktorfitExtension(
                 GRADLE_TASKNAME
-            ).kotlinVersion.getOrElse(myproject.kotlinExtension.compilerVersion.get())
-        checkKotlinVersion(compilerVersion)
+            ).kotlinVersion.getOrElse(KTORFIT_COMPILER_PLUGIN_VERSION)
 
         return SubpluginArtifact(
             groupId = GROUP_NAME,
             artifactId = ARTIFACT_NAME,
-            version = "${KTORFIT_COMPILER_PLUGIN_VERSION}-$compilerVersion$SNAPSHOT",
+            version = compilerVersion
         )
     }
 

ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt

@@ -19,10 +19,9 @@ 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_KSP_PLUGIN_VERSION = "2.3.0"
-        const val KTORFIT_COMPILER_PLUGIN_VERSION = "2.1.0"
-        const val SNAPSHOT = ""
-        const val MIN_KSP_VERSION = "1.0.30"
+        const val KTORFIT_KSP_PLUGIN_VERSION = "2.4.0"
+        const val KTORFIT_COMPILER_PLUGIN_VERSION = "2.2.0"
+        const val MIN_KSP_VERSION = "1.0.28"
         const val MIN_KOTLIN_VERSION = "2.1.0"
     }
 
@@ -91,7 +90,7 @@ class KtorfitGradlePlugin : Plugin<Project> {
                         }
                     }
                 }
-                val dependency = "$ktorfitKsp:$KTORFIT_KSP_PLUGIN_VERSION-$kspVersion$SNAPSHOT"
+                val dependency = "$ktorfitKsp:$KTORFIT_KSP_PLUGIN_VERSION"
 
                 when (val kotlinExtension = kotlinExtension) {
                     is KotlinSingleTargetExtension<*> -> {

ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitPluginExtension.kt

@@ -3,9 +3,6 @@ package de.jensklingenberg.ktorfit.gradle
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
-import org.jetbrains.kotlin.buildtools.api.ExperimentalBuildToolsApi
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import javax.inject.Inject
 
 /**
@@ -37,11 +34,10 @@ open class KtorfitPluginExtension
          */
         open val kotlinVersion: Property<String> = objectFactory.property(String::class.java)
 
-        @OptIn(ExperimentalKotlinGradlePluginApi::class, ExperimentalBuildToolsApi::class)
         internal fun setupConvention(project: Project) {
             generateQualifiedTypeName.convention(false)
             errorCheckingMode.convention(ErrorCheckingMode.ERROR)
-            kotlinVersion.convention(project.kotlinExtension.compilerVersion)
+            kotlinVersion.convention(KtorfitGradlePlugin.KTORFIT_COMPILER_PLUGIN_VERSION)
         }
     }
 

sandbox/src/jvmMain/kotlin/de/jensklingenberg/ktorfit/demo/JvMMain.kt

@@ -58,7 +58,7 @@ val userKtorfit =
         )
     }
 
-val api: ExampleApi = userKtorfit.createExampleApi()
+val api: ExampleApi = userKtorfit.create<ExampleApi>()
 
 fun main() {
     runBlocking {