From 7a7d7dca8459dd2fbd110c4eb79a878c3ed8bffa Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Fri, 9 Aug 2024 22:54:48 +0200 Subject: [PATCH 1/6] Release 2.0.1 (#628) --- README.md | 17 +++++++++-------- docs/CHANGELOG.md | 6 +++--- docs/index.md | 17 +++++++++-------- gradle/libs.versions.toml | 8 ++++---- .../ktorfit/gradle/KtorfitGradlePlugin.kt | 11 +++++++---- mkdocs.yml | 2 +- 6 files changed, 33 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 57039b905..ad0365e52 100644 --- a/README.md +++ b/README.md @@ -28,14 +28,15 @@ 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) | +| 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 index 8e97585a8..ff70ec81d 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,15 +7,15 @@ 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 - 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 +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 index c55b69a7a..552cd3193 100644 --- 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 index 28778633e..9bfc7b90e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,13 +11,13 @@ kotlinPoet = "1.18.1" kspVersion = "2.0.0-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.0" 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" 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 7f43fc995..a2390aae4 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,9 +15,9 @@ 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.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 { 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 index e740007e9..e41b29cf2 100644 --- 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: From eedce925b6907bc8c969f5c9b1933905970513bc Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Fri, 9 Aug 2024 23:09:50 +0200 Subject: [PATCH 2/6] Update CHANGELOG.md --- docs/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index ff70ec81d..c34d15a6d 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,6 +7,8 @@ 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]() + 2.0.1 - 2024-08-08 ======================================== ### Fixed @@ -15,6 +17,8 @@ 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 From 9a58ad73aa13d643978e95554926cc6dc8172873 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sat, 10 Aug 2024 12:24:47 +0200 Subject: [PATCH 3/6] Update to Kotlin 2.0.10 (#629) * Update Kotlin * Update CHANGELOG.md * Update README.md --- README.md | 1 + docs/CHANGELOG.md | 6 ++++++ gradle/libs.versions.toml | 6 +++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ad0365e52..965dacb52 100644 --- 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 index c34d15a6d..c3746e3af 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -9,6 +9,10 @@ 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 @@ -17,6 +21,8 @@ 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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9bfc7b90e..c2f81b4aa 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.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" From da86b683f432a2c6adcf91ee614e34bb34da03dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:41:29 +0200 Subject: [PATCH 4/6] fix(deps): update dependency com.vanniktech:gradle-maven-publish-plugin to v0.29.0 (#609) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- 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 c2f81b4aa..02efde8ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ ktorfitGradlePlugin = "2.0.0" ktorVersion = "2.3.12" mockk = "1.13.11" mockito-kotlin = "4.1.0" -gradleMavenPublishPlugin = "0.28.0" +gradleMavenPublishPlugin = "0.29.0" vannikMavenPublish = "0.28.0" [libraries] From 5ffee8a41e23bb5242dd387ffa1f8a053f040134 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 13:52:33 +0000 Subject: [PATCH 5/6] chore(deps): update dependency com.vanniktech.maven.publish to v0.29.0 (#608) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- 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 02efde8ba..f37108468 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ ktorVersion = "2.3.12" mockk = "1.13.11" mockito-kotlin = "4.1.0" gradleMavenPublishPlugin = "0.29.0" -vannikMavenPublish = "0.28.0" +vannikMavenPublish = "0.29.0" [libraries] android-build-gradle = "com.android.tools.build:gradle:8.2.2" From 8851142bce937505dfdce7fbdcd7d3badbf284d5 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Mon, 12 Aug 2024 17:46:41 +0200 Subject: [PATCH 6/6] Change dependency name --- ktorfit-lib-core/build.gradle.kts | 2 +- ktorfit-lib/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ktorfit-lib-core/build.gradle.kts b/ktorfit-lib-core/build.gradle.kts index 7ac976b93..fad2999c9 100644 --- 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 index 082da2446..66f63f14b 100644 --- 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 { "" }