From 2dcbbba2324a56f5e69ebfb9b356f5d360af55d2 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 13:31:42 +0200 Subject: [PATCH 1/2] Update publish-converters.yml --- .github/workflows/publish-converters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-converters.yml b/.github/workflows/publish-converters.yml index db49bd42b..aed55c0dc 100644 --- a/.github/workflows/publish-converters.yml +++ b/.github/workflows/publish-converters.yml @@ -16,7 +16,7 @@ jobs: distribution: 'temurin' java-version: 21 - - uses: gradle/gradle-build-action@v4 + - uses: gradle/gradle-build-action@v3 - name: Publish release run: ./gradlew :ktorfit-converters:call:publishAllPublicationsToMavenCentralRepository :ktorfit-converters:flow:publishAllPublicationsToMavenCentralRepository :ktorfit-converters:response:publishAllPublicationsToMavenCentralRepository From f3b1458fb24bab30d23710b942f9b0272853df58 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 1 Sep 2024 15:04:07 +0200 Subject: [PATCH 2/2] Release 2.1.0 (#662) --- docs/CHANGELOG.md | 24 ++++++++++++++++--- docs/index.md | 9 +++---- gradle/libs.versions.toml | 14 +++++------ .../ktorfit/gradle/KtorfitGradlePlugin.kt | 2 +- mkdocs.yml | 2 +- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 61ee66686..4964564f8 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,10 +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]() -Unreleased -======================================== +* Supported Kotlin version: (min) 2.0.0 +* Supported KSP version: (min) 1.0.24 +* Ktor version: 2.3.12 ## Added - documentation page for [known issues](https://foso.github.io/Ktorfit/knownissues/) @@ -24,8 +25,25 @@ 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 + +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]() +* 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..754608413 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" -ktorfitCallConverter = "2.0.1" -ktorfitFlowConverter = "2.0.1" -ktorfitResponseConverter = "2.0.1" -ktorfitGradle = "2.0.1" +ktorfit = "2.1.0" +ktorfitKsp = "2.1.0-1.0.24" +ktorfitCompiler = "2.1.0-2.0.20" +ktorfitCallConverter = "2.1.0" +ktorfitFlowConverter = "2.1.0" +ktorfitResponseConverter = "2.1.0" +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..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 @@ -15,7 +15,7 @@ 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" 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: