Merge branch 'refs/heads/master' into ktor3

# Conflicts: # README.md # docs/CHANGELOG.md # gradle/libs.versions.toml
Foso · Aug 12, 2024 · a4440f0 · a4440f0
2 parents ba54b9c + cbfd9c7
commit a4440f0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ See https://foso.github.io/Ktorfit/#compatibility
 |-----------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
 | Ktorfit Gradle Plugin       | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/de.jensklingenberg.ktorfit.gradle.plugin)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/de.jensklingenberg.ktorfit.gradle.plugin) |
 | ktorfit-lib                 |                              [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib)                              |
+| compiler-plugin             |                          [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/compiler-plugin)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/compiler-plugin)                          |
 | ktorfit-lib-light           |                        [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-light)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-light)                        |
 | ktorfit-ksp                 |                              [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-ksp)                              |
 | ktorfit-converters-flow     |                  [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-flow)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-flow)                  |

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -7,6 +7,12 @@ 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. 
 
+# [2.0.1]()
+
+compiler-plugin:2.0.1-2.0.10 - 2024-08-10
+========================================
+- Kotlin 2.0.10
+
 2.0.1 - 2024-08-08
 ========================================
 ### Fixed
@@ -15,6 +21,10 @@ But there is no intent to bump the Ktorfit major version for every KSP update.
 - #621 RequestConverter causing compile error
 - Build with Ktor 2.3.12
 
+
+
+# [2.0.0]()
+
 ktorfit-ksp-2.0.0-1.0.24 - 2024-08-06
 ========================================
 - Build with KSP 1.0.24

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,14 +6,14 @@ coroutines = "1.8.1"
 detekt = "1.23.6"
 junit = "4.13.2"
 kctfork = "0.4.1"
-kotlin = "2.0.0"
+kotlin = "2.0.10"
 kotlinPoet = "1.18.1"
-kspVersion = "2.0.0-1.0.24"
+kspVersion = "2.0.10-1.0.24"
 
 groupId = "de.jensklingenberg.ktorfit"
 ktorfit = "2.0.1"
 ktorfitKsp = "2.0.1-1.0.24"
-ktorfitCompiler = "2.0.1-2.0.0"
+ktorfitCompiler = "2.0.1-2.0.10"
 ktorfitCallConverter = "2.0.0"
 ktorfitFlowConverter = "2.0.0"
 ktorfitResponseConverter = "2.0.0"
@@ -23,8 +23,8 @@ ktorfitGradlePlugin = "2.0.0"
 ktorVersion = "3.0.0-beta-2"
 mockk = "1.13.11"
 mockito-kotlin = "4.1.0"
-gradleMavenPublishPlugin = "0.28.0"
-vannikMavenPublish = "0.28.0"
+gradleMavenPublishPlugin = "0.29.0"
+vannikMavenPublish = "0.29.0"
 
 [libraries]
 android-build-gradle = "com.android.tools.build:gradle:8.2.2"

diff --git a/ktorfit-lib-core/build.gradle.kts b/ktorfit-lib-core/build.gradle.kts
@@ -59,7 +59,7 @@ mavenPublishing {
                     .get()
                     .startsWith("3.")
             ) {
-                "-ktor3-" + libs.versions.ktorVersion.get()
+                "-ktor-" + libs.versions.ktorVersion.get()
             } else {
                 ""
             }

diff --git a/ktorfit-lib/build.gradle.kts b/ktorfit-lib/build.gradle.kts
@@ -24,7 +24,7 @@ mavenPublishing {
                     .get()
                     .startsWith("3.")
             ) {
-                "-ktor3-" + libs.versions.ktorVersion.get()
+                "-ktor-" + libs.versions.ktorVersion.get()
             } else {
                 ""
             }