Merge remote-tracking branch 'origin/master'

Foso · Aug 12, 2024 · cbfd9c7 · cbfd9c7
2 parents 8851142 + 5ffee8a
commit cbfd9c7
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -28,14 +28,16 @@ See https://foso.github.io/Ktorfit/#compatibility
 
 ## Ktorfit Packages
 
-| Project   |      Version      |
-|----------|:-------------:|
-| 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) |
-| 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-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) |
-| 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) |
+| Project                     |                                                                                                                  Version                                                                                                                  |
+|-----------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| 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)                  |
+| 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)              |
 
 
 ## 👷 Project Structure

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -7,15 +7,25 @@ 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
+# [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
 - #594 Endpoint with types from other module
 - #591 Ktorfit plugin doesn't include correct generate source if build directory changes #591
+- #621 RequestConverter causing compile error
 - Build with Ktor 2.3.12
-- #621 RequestConverter causing compile error 
 
-ktorfit-ksp-2.0.0-1.0.24 - 2024-06-08
+
+
+# [2.0.0]()
+
+ktorfit-ksp-2.0.0-1.0.24 - 2024-08-06
 ========================================
 - Build with KSP 1.0.24
 

diff --git a/docs/index.md b/docs/index.md
@@ -15,14 +15,15 @@ inspired by [Retrofit](https://square.github.io/retrofit/)
 
 ## Compatibility
 
-| Ktorfit-version   |    Kotlin     |     KSP      |    Ktor    |
-|-------------------|:-------------:|:------------:|:----------:|
-| **_2.0.0_**       |  **>=2.0.0**  | **>=1.0.21** | **2.3.11** |
-| **_2.0.0-rc01_**  | **2.0.0-RC3** |  **1.0.20**  | **2.3.11** |
-| **_2.0.0-beta1_** | **2.0.0-RC1** |  **1.0.20**  | **2.3.10** |
-| **_1.14.0_**      | **2.0.0-RC1** |  **1.0.20**  | **2.3.10** |
-| **_1.13.0_**      |  **1.9.23**   |  **1.0.20**  | **2.3.10** |
-| **_1.12.0_**      |  **1.9.22**   |  **1.0.16**  | **2.3.6**  |
+| Ktorfit-version   |    Kotlin     |              KSP              |    Ktor    |
+|-------------------|:-------------:|:-----------------------------:|:----------:|
+| **_2.0.1_**       |  **>=2.0.0**  |         **>=1.0.24**          | **2.3.12** |
+| **_2.0.0_**       |   **2.0.0**   | **1.0.21 (min) 1.0.24 (max)** | **2.3.11** |
+| **_2.0.0-rc01_**  | **2.0.0-RC3** |          **1.0.20**           | **2.3.11** |
+| **_2.0.0-beta1_** | **2.0.0-RC1** |          **1.0.20**           | **2.3.10** |
+| **_1.14.0_**      | **2.0.0-RC1** |          **1.0.20**           | **2.3.10** |
+| **_1.13.0_**      |  **1.9.23**   |          **1.0.20**           | **2.3.10** |
+| **_1.12.0_**      |  **1.9.22**   |          **1.0.16**           | **2.3.6**  |
 
 
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,25 +6,25 @@ 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.0"
-ktorfitKsp = "2.0.0-1.0.24"
-ktorfitCompiler = "2.0.0-2.0.0"
+ktorfit = "2.0.1"
+ktorfitKsp = "2.0.1-1.0.24"
+ktorfitCompiler = "2.0.1-2.0.10"
 ktorfitCallConverter = "2.0.0"
 ktorfitFlowConverter = "2.0.0"
 ktorfitResponseConverter = "2.0.0"
-ktorfitGradle = "2.0.0"
+ktorfitGradle = "2.0.1"
 
 ktorfitGradlePlugin = "2.0.0"
 ktorVersion = "2.3.12"
 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-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt b/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradlePlugin.kt
@@ -15,9 +15,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_VERSION = "2.0.0" // remember to bump this version before any release!
+        const val KTORFIT_VERSION = "2.0.1" // remember to bump this version before any release!
         const val SNAPSHOT = ""
-        const val MIN_KSP_VERSION = "1.0.21"
+        const val MIN_KSP_VERSION = "1.0.24"
         const val MIN_KOTLIN_VERSION = "2.0.0"
     }
 
@@ -35,8 +35,11 @@ class KtorfitGradlePlugin : Plugin<Project> {
                     plugins.findPlugin("com.google.devtools.ksp") ?: error("KSP plugin not found")
 
                 val kspVersion =
-                    kspPlugin.javaClass.protectionDomain.codeSource.location.toURI().toString()
-                        .substringAfterLast("-").substringBefore(".jar")
+                    kspPlugin.javaClass.protectionDomain.codeSource.location
+                        .toURI()
+                        .toString()
+                        .substringAfterLast("-")
+                        .substringBefore(".jar")
 
                 checkKSPVersion(kspVersion)
 

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