From 385b7db4a00eebf5de7f6e5dffcc21dfacaf85d9 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 11:42:27 +0200 Subject: [PATCH 01/12] Release 2.1.0 --- docs/CHANGELOG.md | 10 +++++++++- docs/index.md | 9 +++++---- gradle/libs.versions.toml | 8 ++++---- .../ktorfit/gradle/KtorfitGradlePlugin.kt | 4 ++-- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 61ee66686..d4dd586bf 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,7 +7,11 @@ 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.1.0]() + +* Supported Kotlin version: (min) 2.0.20 +* Supported KSP version: (min) 1.0.24 +* Ktor version: 2.3.12 Unreleased ======================================== @@ -26,6 +30,10 @@ or your own ConverterFactory to the converterFactories. [#618](https://github.co # [2.0.1]() +* Supported Kotlin version: (min) 2.0.0 (max) 2.0.20 +* Supported KSP version: (min) 1.0.24 (max) 1.0.24 +* Ktor version: 2.3.12 + 2.0.1 - 2024-08-08 ======================================== ## Fixed diff --git a/docs/index.md b/docs/index.md index c15ad6b7f..a0626b557 100644 --- a/docs/index.md +++ b/docs/index.md @@ -15,10 +15,11 @@ inspired by [Retrofit](https://square.github.io/retrofit/) ## Compatibility -| Ktorfit-version | Kotlin | KSP | Ktor | -|-------------------|:-------------:|:-----------------------------:|:----------:| -| **_2.0.1_** | **>=2.0.0** | **>=1.0.24 min** | **2.3.12** | -| **_2.0.0_** | **2.0.0** | **1.0.21 (min) 1.0.24 (max)** | **2.3.11** | +| Ktorfit-version | +|-------------------------------------------------------------------------------| +| **_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 | # Installation diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1fe9ce66..b7aea8201 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,13 +11,13 @@ kotlinPoet = "1.18.1" kspVersion = "2.0.20-1.0.24" groupId = "de.jensklingenberg.ktorfit" -ktorfit = "2.0.1" -ktorfitKsp = "2.0.1-1.0.24" -ktorfitCompiler = "2.0.1-2.0.20" +ktorfit = "2.1.0" +ktorfitKsp = "2.1.0-1.0.24" +ktorfitCompiler = "2.1.0-2.0.20" ktorfitCallConverter = "2.0.1" ktorfitFlowConverter = "2.0.1" ktorfitResponseConverter = "2.0.1" -ktorfitGradle = "2.0.1" +ktorfitGradle = "2.1.0" ktorfitGradlePlugin = "2.0.1" ktorVersion = "2.3.12" 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 index c0ab3f38f..91e31b4de 100644 --- 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,10 +15,10 @@ class KtorfitGradlePlugin : Plugin { 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.1" // remember to bump this version before any release! + const val KTORFIT_VERSION = "2.1.0" // remember to bump this version before any release! const val SNAPSHOT = "" const val MIN_KSP_VERSION = "1.0.24" - const val MIN_KOTLIN_VERSION = "2.0.0" + const val MIN_KOTLIN_VERSION = "2.0.20" } override fun apply(project: Project) { From c53c6d2d4e31bf849b19e1c1a9cfe8d97f89f5ac Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 11:44:13 +0200 Subject: [PATCH 02/12] Release 2.1.0 --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index d4dd586bf..2a7e3bd33 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -13,7 +13,7 @@ But there is no intent to bump the Ktorfit major version for every KSP update. * Supported KSP version: (min) 1.0.24 * Ktor version: 2.3.12 -Unreleased +Ktorfit-lib ======================================== ## Added From fc6311ad07dc7ae9ad09c7ad8daff961753c74a3 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 11:44:41 +0200 Subject: [PATCH 03/12] Release 2.1.0 --- docs/CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 2a7e3bd33..77bf93caa 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -13,9 +13,6 @@ But there is no intent to bump the Ktorfit major version for every KSP update. * Supported KSP version: (min) 1.0.24 * Ktor version: 2.3.12 -Ktorfit-lib -======================================== - ## Added - documentation page for [known issues](https://foso.github.io/Ktorfit/knownissues/) From 0f494af4fe83d63515ad47ecf154345c9fb9f1b0 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 11:46:17 +0200 Subject: [PATCH 04/12] Release 2.1.0 --- docs/CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 77bf93caa..7a9a3df88 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -25,6 +25,18 @@ or your own ConverterFactory to the converterFactories. [#618](https://github.co - Task with path 'kspCommonMainKotlinMetadata' not found in project [#593](https://github.com/Foso/Ktorfit/issues/593) - Ktorfit Gradle Plugin not compatible with Android Multiplatform Library plugin [#638](https://github.com/Foso/Ktorfit/issues/638) + +## Ktor3 +The "normal" dependencies will stay on Ktor 2.x till 3.0 is stable. But here are versions that you can use when want to use Ktor3 and WasmJs + +| Project | Version | +|-----------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| +| ktorfit-lib-light-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-light-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-light-ktor-3.0.0-beta-2) | +| ktorfit-lib-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-ktor-3.0.0-beta-2) | +| ktorfit-converters-flow-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-flow-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-flow-ktor-3.0.0-beta-2) | +| ktorfit-converters-call-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-call-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-call-ktor-3.0.0-beta-2) | +| ktorfit-converters-response-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-response-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-response-ktor-3.0.0-beta-2) | + # [2.0.1]() * Supported Kotlin version: (min) 2.0.0 (max) 2.0.20 From 9d3cb9772a644dc44c4d2681a3a73818f782756d Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 11:48:41 +0200 Subject: [PATCH 05/12] Release 2.1.0 --- docs/CHANGELOG.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 7a9a3df88..b8df96c7d 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -25,17 +25,18 @@ or your own ConverterFactory to the converterFactories. [#618](https://github.co - Task with path 'kspCommonMainKotlinMetadata' not found in project [#593](https://github.com/Foso/Ktorfit/issues/593) - Ktorfit Gradle Plugin not compatible with Android Multiplatform Library plugin [#638](https://github.com/Foso/Ktorfit/issues/638) - ## Ktor3 The "normal" dependencies will stay on Ktor 2.x till 3.0 is stable. But here are versions that you can use when want to use Ktor3 and WasmJs -| Project | Version | -|-----------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| -| ktorfit-lib-light-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-light-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-light-ktor-3.0.0-beta-2) | -| ktorfit-lib-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-lib-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-lib-ktor-3.0.0-beta-2) | -| ktorfit-converters-flow-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-flow-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-flow-ktor-3.0.0-beta-2) | -| ktorfit-converters-call-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-call-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-call-ktor-3.0.0-beta-2) | -| ktorfit-converters-response-ktor-3.0.0-beta-2 | [![Maven Central](https://img.shields.io/maven-central/v/de.jensklingenberg.ktorfit/ktorfit-converters-response-ktor-3.0.0-beta-2)](https://central.sonatype.com/artifact/de.jensklingenberg.ktorfit/ktorfit-converters-response-ktor-3.0.0-beta-2) | +de.jensklingenberg.ktorfit:ktorfit-lib-light-ktor-3.0.0-beta-2:2.1.0 + +de.jensklingenberg.ktorfit:ktorfit-lib-ktor-3.0.0-beta-2:2.1.0 + +de.jensklingenberg.ktorfit:ktorfit-converters-flow-ktor-3.0.0-beta-2 :2.1.0 + +de.jensklingenberg.ktorfit:ktorfit-converters-call-ktor-3.0.0-beta-2:2.1.0 + +de.jensklingenberg.ktorfit:ktorfit-converters-response-ktor-3.0.0-beta-2:2.1.0 # [2.0.1]() From 5e612854ed0999dc48f2da6ac060a53c43c9d0e3 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 11:53:16 +0200 Subject: [PATCH 06/12] Release 2.1.0 --- docs/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b8df96c7d..fb4c22bac 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -32,7 +32,7 @@ de.jensklingenberg.ktorfit:ktorfit-lib-light-ktor-3.0.0-beta-2:2.1.0 de.jensklingenberg.ktorfit:ktorfit-lib-ktor-3.0.0-beta-2:2.1.0 -de.jensklingenberg.ktorfit:ktorfit-converters-flow-ktor-3.0.0-beta-2 :2.1.0 +de.jensklingenberg.ktorfit:ktorfit-converters-flow-ktor-3.0.0-beta-2:2.1.0 de.jensklingenberg.ktorfit:ktorfit-converters-call-ktor-3.0.0-beta-2:2.1.0 From 682ea88102142335b3cc1acf491afa3e3f912ce8 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 11:54:49 +0200 Subject: [PATCH 07/12] Release 2.1.0 --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index c25996176..b982427be 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,7 +13,7 @@ extra: site: images: '../../images' ktorfit: - release: "2.0.1" + release: "2.1.0" ktor: release: "2.3.12" social: From f3e414d85f46095802953b37808a50cdaf5240e9 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 13:04:47 +0200 Subject: [PATCH 08/12] Release 2.1.0 --- docs/CHANGELOG.md | 2 +- gradle/libs.versions.toml | 12 ++++++------ .../ktorfit/gradle/KtorfitGradlePlugin.kt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index fb4c22bac..4964564f8 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -9,7 +9,7 @@ But there is no intent to bump the Ktorfit major version for every KSP update. # [2.1.0]() -* Supported Kotlin version: (min) 2.0.20 +* Supported Kotlin version: (min) 2.0.0 * Supported KSP version: (min) 1.0.24 * Ktor version: 2.3.12 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7aea8201..19a8598a9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,17 +6,17 @@ coroutines = "1.8.1" detekt = "1.23.6" junit = "4.13.2" kctfork = "0.5.1" -kotlin = "2.0.20" +kotlin = "2.0.0" kotlinPoet = "1.18.1" -kspVersion = "2.0.20-1.0.24" +kspVersion = "2.0.0-1.0.24" groupId = "de.jensklingenberg.ktorfit" ktorfit = "2.1.0" ktorfitKsp = "2.1.0-1.0.24" -ktorfitCompiler = "2.1.0-2.0.20" -ktorfitCallConverter = "2.0.1" -ktorfitFlowConverter = "2.0.1" -ktorfitResponseConverter = "2.0.1" +ktorfitCompiler = "2.1.0-2.0.0" +ktorfitCallConverter = "2.1.0" +ktorfitFlowConverter = "2.1.0" +ktorfitResponseConverter = "2.1.0" ktorfitGradle = "2.1.0" ktorfitGradlePlugin = "2.0.1" 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 index 91e31b4de..d5c225434 100644 --- 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 @@ -18,7 +18,7 @@ class KtorfitGradlePlugin : Plugin { const val KTORFIT_VERSION = "2.1.0" // remember to bump this version before any release! const val SNAPSHOT = "" const val MIN_KSP_VERSION = "1.0.24" - const val MIN_KOTLIN_VERSION = "2.0.20" + const val MIN_KOTLIN_VERSION = "2.0.0" } override fun apply(project: Project) { From 5d10c56332e31aa5bfd8c6ac07c5e3a9b2de2ee3 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 14:47:00 +0200 Subject: [PATCH 09/12] Release 2.1.0 --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 19a8598a9..c16462022 100644 --- 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.5.1" -kotlin = "2.0.0" +kotlin = "2.0.10" kotlinPoet = "1.18.1" -kspVersion = "2.0.0-1.0.24" +kspVersion = "2.0.20-1.0.24" groupId = "de.jensklingenberg.ktorfit" ktorfit = "2.1.0" ktorfitKsp = "2.1.0-1.0.24" -ktorfitCompiler = "2.1.0-2.0.0" +ktorfitCompiler = "2.1.0-2.0.10" ktorfitCallConverter = "2.1.0" ktorfitFlowConverter = "2.1.0" ktorfitResponseConverter = "2.1.0" From ea000757e0d817dab49e73bc01e1f012cd114e70 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 14:47:15 +0200 Subject: [PATCH 10/12] Release 2.1.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c16462022..ac8a0ba07 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ junit = "4.13.2" kctfork = "0.5.1" kotlin = "2.0.10" kotlinPoet = "1.18.1" -kspVersion = "2.0.20-1.0.24" +kspVersion = "2.0.10-1.0.24" groupId = "de.jensklingenberg.ktorfit" ktorfit = "2.1.0" From 001eb2dd69b79a02f894699cb148777f50fe2c8b Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 14:56:09 +0200 Subject: [PATCH 11/12] Release 2.1.0 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ac8a0ba07..9fa39da88 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,9 +6,9 @@ coroutines = "1.8.1" detekt = "1.23.6" junit = "4.13.2" kctfork = "0.5.1" -kotlin = "2.0.10" +kotlin = "2.0.20" kotlinPoet = "1.18.1" -kspVersion = "2.0.10-1.0.24" +kspVersion = "2.0.20-1.0.24" groupId = "de.jensklingenberg.ktorfit" ktorfit = "2.1.0" From 27afb9e33303164f4a43a652790b1b8e98bb92d9 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 14:56:51 +0200 Subject: [PATCH 12/12] Release 2.1.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9fa39da88..754608413 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ kspVersion = "2.0.20-1.0.24" groupId = "de.jensklingenberg.ktorfit" ktorfit = "2.1.0" ktorfitKsp = "2.1.0-1.0.24" -ktorfitCompiler = "2.1.0-2.0.10" +ktorfitCompiler = "2.1.0-2.0.20" ktorfitCallConverter = "2.1.0" ktorfitFlowConverter = "2.1.0" ktorfitResponseConverter = "2.1.0"