Release 2.2.0 (#735)

Foso · Nov 10, 2024 · e8021b9 · e8021b9
2 parents 12484e6 + b6a4968
commit e8021b9
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -39,18 +39,6 @@ See https://foso.github.io/Ktorfit/#compatibility
 | ktorfit-converters-call     |                  [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-call)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-call)                  |
 | ktorfit-converters-response |              [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-response)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-response)              |
 
-## Ktorfit Ktor 3 Packages
-The main dependencies will stay on Ktor 2.x till Ktor 3 is stable.
-When you want to use Ktor 3 and WasmJs, you need to replace your dependencies with a "ktor3" version, you can use the following packages:
-
-| Project                           |                                                                                                                       Version                                                                                                                       |
-|-----------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-| ktorfit-lib-light-ktor-3.0.0           |           [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-light-ktor-3.0.0)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-light-ktor-3.0.0)           |
-| ktorfit-lib-ktor-3.0.0                 |                 [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-ktor-3.0.0)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-ktor-3.0.0)                 |
-| ktorfit-converters-flow-ktor-3.0.0     |     [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-flow-ktor-3.0.0)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-flow-ktor-3.0.0)     |
-| ktorfit-converters-call-ktor-3.0.0     |     [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-call-ktor-3.0.0)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-call-ktor-3.0.0)     |
-| ktorfit-converters-response-ktor-3.0.0 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-response-ktor-3.0.0)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-response-ktor-3.0.0) |
-
 You can find all Ktorfit packages on [Maven Central](https://search.maven.org/search?q=de.jensklingenberg.ktorfit).
 
 🔎 Check the [latest changes](https://github.com/Foso/Ktorfit/blob/master/docs/CHANGELOG.md) to update your project.

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -7,10 +7,10 @@ and this project orients towards [Semantic Versioning](http://semver.org/spec/v2
 Note: This project needs KSP to work and every new Ktorfit with an update of the KSP version is technically a breaking change.
 But there is no intent to bump the Ktorfit major version for every KSP update. 
 
-# [Unreleased]()
-* Supported Kotlin version: 
-* Supported KSP version:
-* Ktor version:
+# [2.2.0]()
+* Supported Kotlin version: 2.0.0; 2.0.10; 2.0.20, 2.1.0-Beta1; 2.0.21-RC, 2.0.21
+* Supported KSP version: 1.0.27
+* Ktor version: 3.0.1
 
 ## Changed 
 - Ktorfit is now using Ktor 3.0.1 as a default. The extra versions with "-ktor3" will not be updated anymore.
@@ -20,8 +20,8 @@ But there is no intent to bump the Ktorfit major version for every KSP update.
 -  Inheritance problem [#663](https://github.com/Foso/Ktorfit/issues/663)
 See https://foso.github.io/Ktorfit/generation/#nodelegation
 
-- Generated classes do not propagate opt-in ExperimentalUuidApi [666](https://github.com/Foso/Ktorfit/issues/666)
-OptIn annotations on interfaces and functions will now be propagated to the generated classes.
+- Generated classes do not propagate opt-in ExperimentalUuidApi [666](https://github.com/Foso/Ktorfit/issues/666) 
+ OptIn annotations on interfaces and functions will now be propagated to the generated classes.
 
 - Fixed documentation for converters to match the current version.
 - Unresolved reference setBody in generated API implementations [#726](https://github.com/Foso/Ktorfit/issues/726)

diff --git a/docs/index.md b/docs/index.md
@@ -17,6 +17,7 @@ inspired by [Retrofit](https://square.github.io/retrofit/)
 
 | Ktorfit-version                                                               | 
 |-------------------------------------------------------------------------------|
+| **_2.2.0_** https://github.com/Foso/Ktorfit/blob/master/docs/CHANGELOG.md#220 |
 | **_2.1.0_** https://github.com/Foso/Ktorfit/blob/master/docs/CHANGELOG.md#210 |
 | **_2.0.1_** https://github.com/Foso/Ktorfit/blob/master/docs/CHANGELOG.md#201 |  
 | **_2.0.0_** https://github.com/Foso/Ktorfit/blob/master/docs/CHANGELOG.md#200 | 

diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("com.android.library")
     id("com.google.devtools.ksp") version "2.0.21-1.0.27"
     id("kotlinx-serialization")
-    id("de.jensklingenberg.ktorfit") version "2.1.0"
+    id("de.jensklingenberg.ktorfit") version "2.2.0"
 }
 
 ktorfit {
@@ -16,7 +16,7 @@ ktorfit {
 
 version = "1.0"
 val ktorVersion = "3.0.1"
-val ktorfitVersion = "2.1.0"
+val ktorfitVersion = "2.2.0"
 
 kotlin {
     jvmToolchain(8)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
 [versions]
 abg= "8.2.2"
 autoService = "1.1.1"
-autoServiceKsp = "1.10"
 binaryCompatibilityValidator = "0.16.3"
 coroutines = "1.8.1"
 detekt = "1.23.7"
@@ -12,13 +11,13 @@ kotlinPoet = "1.18.1"
 kspVersion = "2.0.21-1.0.27"
 
 groupId = "de.jensklingenberg.ktorfit"
-ktorfit = "2.1.0"
-ktorfitKsp = "2.1.0-1.0.27"
+ktorfit = "2.2.0"
+ktorfitKsp = "2.2.0-1.0.27"
 ktorfitCompiler = "2.1.0-2.0.21"
-ktorfitCallConverter = "2.1.0"
-ktorfitFlowConverter = "2.1.0"
-ktorfitResponseConverter = "2.1.0"
-ktorfitGradle = "2.1.0"
+ktorfitCallConverter = "2.2.0"
+ktorfitFlowConverter = "2.2.0"
+ktorfitResponseConverter = "2.2.0"
+ktorfitGradle = "2.2.0"
 
 ktorfitGradlePlugin = "2.1.0"
 ktorVersion = "3.0.1"

diff --git a/ktorfit-converters/call/build.gradle.kts b/ktorfit-converters/call/build.gradle.kts
@@ -22,15 +22,7 @@ val enableSigning = project.hasProperty("signingInMemoryKey")
 
 mavenPublishing {
     val artifactId =
-        "ktorfit-converters-call" +
-            if (libs.versions.ktorVersion
-                    .get()
-                    .startsWith("3.")
-            ) {
-                "-ktor-" + libs.versions.ktorVersion.get()
-            } else {
-                ""
-            }
+        "ktorfit-converters-call"
     coordinates(
         libs.versions.groupId.get(),
         artifactId,
@@ -49,13 +41,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 
 kotlin {
     explicitApi()
-    if (libs.versions.ktorVersion
-            .get()
-            .startsWith("3.")
-    ) {
-        @OptIn(ExperimentalWasmDsl::class)
-        wasmJs()
-    }
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
+    wasmJs()
     jvm {
     }
     js(IR) {

diff --git a/ktorfit-converters/flow/build.gradle.kts b/ktorfit-converters/flow/build.gradle.kts
@@ -23,15 +23,7 @@ val enableSigning = project.hasProperty("signingInMemoryKey")
 
 mavenPublishing {
     val artifactId =
-        "ktorfit-converters-flow" +
-            if (libs.versions.ktorVersion
-                    .get()
-                    .startsWith("3.")
-            ) {
-                "-ktor-" + libs.versions.ktorVersion.get()
-            } else {
-                ""
-            }
+        "ktorfit-converters-flow"
     coordinates(
         libs.versions.groupId.get(),
         artifactId,
@@ -50,13 +42,8 @@ tasks.withType<KotlinCompile> {
 
 kotlin {
     explicitApi()
-    if (libs.versions.ktorVersion
-            .get()
-            .startsWith("3.")
-    ) {
-        @OptIn(ExperimentalWasmDsl::class)
-        wasmJs()
-    }
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
+    wasmJs()
     jvm {
     }
     js(IR) {

diff --git a/ktorfit-converters/response/build.gradle.kts b/ktorfit-converters/response/build.gradle.kts
@@ -23,15 +23,7 @@ val enableSigning = project.hasProperty("signingInMemoryKey")
 
 mavenPublishing {
     val artifactId =
-        "ktorfit-converters-response" +
-            if (libs.versions.ktorVersion
-                    .get()
-                    .startsWith("3.")
-            ) {
-                "-ktor-" + libs.versions.ktorVersion.get()
-            } else {
-                ""
-            }
+        "ktorfit-converters-response"
     coordinates(
         libs.versions.groupId.get(),
         artifactId,
@@ -50,13 +42,8 @@ tasks.withType<KotlinCompile> {
 
 kotlin {
     explicitApi()
-    if (libs.versions.ktorVersion
-            .get()
-            .startsWith("3.")
-    ) {
-        @OptIn(ExperimentalWasmDsl::class)
-        wasmJs()
-    }
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
+    wasmJs()
     jvm {
     }
     js(IR) {

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,10 +16,10 @@ 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.1.0" // remember to bump this version before any release!
+        const val KTORFIT_KSP_PLUGIN_VERSION = "2.2.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_KSP_VERSION = "1.0.27"
         const val MIN_KOTLIN_VERSION = "2.0.0"
     }
 

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -13,7 +13,7 @@ extra:
   site:
     images: '../../images'
   ktorfit:
-    release: "2.1.0"
+    release: "2.2.0"
   ktor:
     release: "2.3.12"
   social: