From 34c48e55aaaecd0eafcb5ee0f48fdf69451bf268 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Mon, 1 Jan 2024 22:21:09 +0100 Subject: [PATCH 1/8] Update Kotlin/KSP to 1.9.22 (#509) --- docs/CHANGELOG.md | 5 +++++ gradle/libs.versions.toml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 674094eb6..c73e31687 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,6 +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 +======================================== +- Compatible with KSP 1.0.16 and Kotlin 1.9.22 + + 1.11.1 - 2023-12-21 ======================================== - Fix compile errors #505 #496 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc8fdd676..02f856768 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,9 +6,9 @@ coroutines = "1.7.3" detekt = "1.23.1" junit = "4.13.2" kctfork = "0.4.0" -kotlin = "1.9.21" +kotlin = "1.9.22" kotlinPoet = "1.15.1" -kspVersion = "1.9.21-1.0.15" +kspVersion = "1.9.22-1.0.16" ktorfit = "1.11.1" ktorfitGradlePlugin = "1.10.1" ktorVersion = "2.3.6" From 93aa71f3a2d2f64b8cc3dacbe2d506a094aa18de Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Tue, 16 Jan 2024 22:41:16 +0100 Subject: [PATCH 2/8] Release 1.12.0 (#514) --- README.md | 10 +++++----- docs/CHANGELOG.md | 2 +- example/AndroidOnlyExample/app/build.gradle.kts | 10 +++++----- example/AndroidOnlyExample/build.gradle | 2 +- example/MultiplatformExample/build.gradle.kts | 4 ++-- example/MultiplatformExample/iosApp/Podfile.lock | 2 +- .../MultiplatformExample/iosApp/Pods/Manifest.lock | 2 +- .../iosApp/Pods/Pods.xcodeproj/project.pbxproj | 4 ++-- example/MultiplatformExample/shared/build.gradle.kts | 6 +++--- example/MultiplatformExample/shared/shared.podspec | 11 +++++++++++ gradle/libs.versions.toml | 2 +- .../ktorfit/gradle/KtorfitGradleConfiguration.kt | 2 +- 12 files changed, 34 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 7c9d26b01..103c95c59 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ build.gradle.kts: ```kotlin plugins { - id("de.jensklingenberg.ktorfit") version "1.11.1" + id("de.jensklingenberg.ktorfit") version "1.12.0" } ``` @@ -40,22 +40,22 @@ build.gradle ```kotlin plugins { - id("de.jensklingenberg.ktorfit") version "1.11.1" + id("de.jensklingenberg.ktorfit") version "1.12.0" } ``` KSP: ```kotlin -de.jensklingenberg.ktorfit:ktorfit-ksp:1.11.1 +de.jensklingenberg.ktorfit:ktorfit-ksp:1.12.0 ``` Ktorfit-lib/-light: ```kotlin -implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.11.1") +implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.12.0") or -implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.11.1") +implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.12.0") ``` ## 👷 Project Structure diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c73e31687..7b29801c1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,7 +7,7 @@ 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 +1.12.0 - 2024-01-16 ======================================== - Compatible with KSP 1.0.16 and Kotlin 1.9.22 diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index 4c4cf0bc7..8c6ed5798 100644 --- a/example/AndroidOnlyExample/app/build.gradle.kts +++ b/example/AndroidOnlyExample/app/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("com.google.devtools.ksp") version "1.9.20-1.0.14" - id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10" - id("de.jensklingenberg.ktorfit") version "1.11.1" + id("com.google.devtools.ksp") version "1.9.22-1.0.16" + id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22" + id("de.jensklingenberg.ktorfit") version "1.12.0" } @@ -41,7 +41,7 @@ android { compose = (true) } composeOptions { - kotlinCompilerExtensionVersion = "1.5.3" + kotlinCompilerExtensionVersion = "1.5.8" } } @@ -51,7 +51,7 @@ tasks.withType().configureEach } } -val ktorfit = "1.11.1" +val ktorfit = "1.12.0" val ktor = "2.3.6" val compose_ui_version = "1.5.1" dependencies { diff --git a/example/AndroidOnlyExample/build.gradle b/example/AndroidOnlyExample/build.gradle index 7c8e737b5..03fa2eb8b 100644 --- a/example/AndroidOnlyExample/build.gradle +++ b/example/AndroidOnlyExample/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '8.0.2' apply false id 'com.android.library' version '8.0.2' apply false - id 'org.jetbrains.kotlin.android' version '1.9.10' apply false + id 'org.jetbrains.kotlin.android' version '1.9.22' apply false } \ No newline at end of file diff --git a/example/MultiplatformExample/build.gradle.kts b/example/MultiplatformExample/build.gradle.kts index 64aa22726..39aa5315d 100644 --- a/example/MultiplatformExample/build.gradle.kts +++ b/example/MultiplatformExample/build.gradle.kts @@ -9,9 +9,9 @@ buildscript { } } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22") classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.20") + classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.22") } } diff --git a/example/MultiplatformExample/iosApp/Podfile.lock b/example/MultiplatformExample/iosApp/Podfile.lock index 031e5dd12..11ec62e2d 100644 --- a/example/MultiplatformExample/iosApp/Podfile.lock +++ b/example/MultiplatformExample/iosApp/Podfile.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756 -COCOAPODS: 1.12.0 +COCOAPODS: 1.14.3 diff --git a/example/MultiplatformExample/iosApp/Pods/Manifest.lock b/example/MultiplatformExample/iosApp/Pods/Manifest.lock index 031e5dd12..11ec62e2d 100644 --- a/example/MultiplatformExample/iosApp/Pods/Manifest.lock +++ b/example/MultiplatformExample/iosApp/Pods/Manifest.lock @@ -13,4 +13,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756 -COCOAPODS: 1.12.0 +COCOAPODS: 1.14.3 diff --git a/example/MultiplatformExample/iosApp/Pods/Pods.xcodeproj/project.pbxproj b/example/MultiplatformExample/iosApp/Pods/Pods.xcodeproj/project.pbxproj index 78bf6897c..634d1ce05 100644 --- a/example/MultiplatformExample/iosApp/Pods/Pods.xcodeproj/project.pbxproj +++ b/example/MultiplatformExample/iosApp/Pods/Pods.xcodeproj/project.pbxproj @@ -210,8 +210,8 @@ BFDFE7DC352907FC980B868725387E98 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1300; - LastUpgradeCheck = 1300; + LastSwiftUpdateCheck = 1500; + LastUpgradeCheck = 1500; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 9.3"; diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index c49946b7e..1bbc8fd22 100644 --- a/example/MultiplatformExample/shared/build.gradle.kts +++ b/example/MultiplatformExample/shared/build.gradle.kts @@ -2,14 +2,14 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") id("com.android.library") - id("com.google.devtools.ksp") version "1.9.21-1.0.15" + id("com.google.devtools.ksp") version "1.9.22-1.0.16" id("kotlinx-serialization") - id("de.jensklingenberg.ktorfit") version "1.11.1" + id("de.jensklingenberg.ktorfit") version "1.12.0" } version = "1.0" val ktorVersion = "2.3.6" -val ktorfitVersion = "1.11.1" +val ktorfitVersion = "1.12.0" kotlin { jvmToolchain(8) diff --git a/example/MultiplatformExample/shared/shared.podspec b/example/MultiplatformExample/shared/shared.podspec index 129a589c3..c043d7ee5 100644 --- a/example/MultiplatformExample/shared/shared.podspec +++ b/example/MultiplatformExample/shared/shared.podspec @@ -11,6 +11,17 @@ Pod::Spec.new do |spec| spec.ios.deployment_target = '14.1' + if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework') + raise " + + Kotlin framework 'shared' doesn't exist yet, so a proper Xcode project can't be generated. + 'pod install' should be executed after running ':generateDummyFramework' Gradle task: + + ./gradlew :shared:generateDummyFramework + + Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" + end + spec.pod_target_xcconfig = { 'KOTLIN_PROJECT_PATH' => ':shared', 'PRODUCT_MODULE_NAME' => 'shared', diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 02f856768..c9260e746 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ kctfork = "0.4.0" kotlin = "1.9.22" kotlinPoet = "1.15.1" kspVersion = "1.9.22-1.0.16" -ktorfit = "1.11.1" +ktorfit = "1.12.0" ktorfitGradlePlugin = "1.10.1" ktorVersion = "2.3.6" mockk = "1.13.8" diff --git a/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt b/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt index e44d69177..fc1509e19 100644 --- a/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt +++ b/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt @@ -10,7 +10,7 @@ open class KtorfitGradleConfiguration { * version number of the compiler plugin */ @Deprecated("Update the Gradle plugin instead of updating this version") - var version: String = "1.11.1" // remember to bump this version before any release! + var version: String = "1.12.0" // remember to bump this version before any release! /** * used to get debug information from the compiler plugin From 312a9f5131b40b3bce34311ba4e5a209332ecd7e Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Tue, 12 Mar 2024 10:25:55 +0100 Subject: [PATCH 3/8] Update KSP 1.0.19, Kotlin 1.9.23, Ktor 2.3.9 (#525) --- .github/workflows/build.yml | 2 +- docs/CHANGELOG.md | 4 ++++ example/AndroidOnlyExample/app/build.gradle.kts | 4 ++-- .../jensklingenberg/androidonlyexample/StarWarsApi.kt | 2 +- .../kotlin/com/example/ktorfittest/StarWarsApi.kt | 2 +- gradle/libs.versions.toml | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11ba13838..e30dc4e63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: 'zulu' - name: Cache Gradle and wrapper uses: actions/cache@v3 diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 7b29801c1..727dc7620 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,6 +7,10 @@ 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. +1.13.0 - XX +======================================== +- Build with KSP 1.0.19, Kotlin 1.9.23, Ktor 2.3.9 + 1.12.0 - 2024-01-16 ======================================== - Compatible with KSP 1.0.16 and Kotlin 1.9.22 diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index 8c6ed5798..c34b24424 100644 --- a/example/AndroidOnlyExample/app/build.gradle.kts +++ b/example/AndroidOnlyExample/app/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("com.google.devtools.ksp") version "1.9.22-1.0.16" - id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22" + id("com.google.devtools.ksp") version "1.9.23-1.0.19" + id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23" id("de.jensklingenberg.ktorfit") version "1.12.0" } diff --git a/example/AndroidOnlyExample/app/src/main/java/de/jensklingenberg/androidonlyexample/StarWarsApi.kt b/example/AndroidOnlyExample/app/src/main/java/de/jensklingenberg/androidonlyexample/StarWarsApi.kt index 1ba0e3337..fa4ee13b9 100644 --- a/example/AndroidOnlyExample/app/src/main/java/de/jensklingenberg/androidonlyexample/StarWarsApi.kt +++ b/example/AndroidOnlyExample/app/src/main/java/de/jensklingenberg/androidonlyexample/StarWarsApi.kt @@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.Flow interface StarWarsApi { companion object { - const val baseUrl = "https://swapi.dev/api/" + const val baseUrl = "https://swapi.info/api/" } @GET("people/{id}/") diff --git a/example/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/StarWarsApi.kt b/example/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/StarWarsApi.kt index 69e0875f6..a65f02ee0 100644 --- a/example/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/StarWarsApi.kt +++ b/example/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/StarWarsApi.kt @@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.Flow interface StarWarsApi { companion object { - const val baseUrl = "https://swapi.dev/api/" + const val baseUrl = "https://swapi.info/api/" } @GET("people/{id}/") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c9260e746..a90a4fdac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,19 +6,19 @@ coroutines = "1.7.3" detekt = "1.23.1" junit = "4.13.2" kctfork = "0.4.0" -kotlin = "1.9.22" -kotlinPoet = "1.15.1" -kspVersion = "1.9.22-1.0.16" +kotlin = "1.9.23" +kotlinPoet = "1.16.0" +kspVersion = "1.9.23-1.0.19" ktorfit = "1.12.0" ktorfitGradlePlugin = "1.10.1" -ktorVersion = "2.3.6" +ktorVersion = "2.3.9" mockk = "1.13.8" mockito-kotlin = "4.1.0" gradleMavenPublishPlugin = "0.25.3" vannikMavenPublish = "0.25.3" [libraries] -android-build-gradle = "com.android.tools.build:gradle:7.4.2" +android-build-gradle = "com.android.tools.build:gradle:8.2.2" auto-service-ksp = { module = "dev.zacsweers.autoservice:auto-service-ksp", version.ref = "autoServiceKsp" } autoService = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradleMavenPublishPlugin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c30b486a8..744c64d12 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 3f2696485c1bab235666490fef1db35b3e2cc91d Mon Sep 17 00:00:00 2001 From: Benoit Billington Date: Sun, 14 Apr 2024 20:56:39 +0200 Subject: [PATCH 4/8] Prepare release/1.13.0 (#527) * Update index.md Update compatibility * Prepare release 1.13.0 --- docs/CHANGELOG.md | 2 +- docs/index.md | 2 ++ gradle/libs.versions.toml | 4 ++-- mkdocs.yml | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 727dc7620..7048ee6a5 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,7 +7,7 @@ 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. -1.13.0 - XX +1.13.0 - 2024-03-18 ======================================== - Build with KSP 1.0.19, Kotlin 1.9.23, Ktor 2.3.9 diff --git a/docs/index.md b/docs/index.md index cdacc5036..3dd762266 100644 --- a/docs/index.md +++ b/docs/index.md @@ -17,6 +17,8 @@ inspired by [Retrofit](https://square.github.io/retrofit/) | Ktorfit-version | Kotlin | KSP | Ktor | |--------------------------|:-------------------------:|:-----------------------:|:---------:| +| **_1.13.0_** | **1.9.23** | **1.0.19** | **2.3.9** | +| **_1.12.0_** | **1.9.22** | **1.0.16** | **2.3.6** | | **_1.11.0_** | **1.9.21** | **1.0.15** | **2.3.6** | | **_1.10.2_** | **1.9.20** | **1.0.14** | **2.3.6** | | **_1.10.1_** | **1.9.20** | **1.0.14** | **2.3.4** | diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a90a4fdac..0e1e0cf19 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,8 +9,8 @@ kctfork = "0.4.0" kotlin = "1.9.23" kotlinPoet = "1.16.0" kspVersion = "1.9.23-1.0.19" -ktorfit = "1.12.0" -ktorfitGradlePlugin = "1.10.1" +ktorfit = "1.13.0" +ktorfitGradlePlugin = "1.12.0" ktorVersion = "2.3.9" mockk = "1.13.8" mockito-kotlin = "4.1.0" diff --git a/mkdocs.yml b/mkdocs.yml index 03252a62b..c0ce650da 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,9 +13,9 @@ extra: site: images: '../../images' ktorfit: - release: "1.10.1" + release: "1.13.0" ktor: - release: "2.3.4" + release: "2.3.9" social: - icon: fontawesome/brands/github-alt link: 'https://github.com/foso' From 20b5ccc3064af7c6d60529a631b324d471fb04d9 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 14 Apr 2024 21:03:53 +0200 Subject: [PATCH 5/8] Update KSP and Ktor --- docs/CHANGELOG.md | 4 ++-- gradle/libs.versions.toml | 4 ++-- mkdocs.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 7048ee6a5..942557c29 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,9 +7,9 @@ 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. -1.13.0 - 2024-03-18 +1.13.0 - 2024-04-14 ======================================== -- Build with KSP 1.0.19, Kotlin 1.9.23, Ktor 2.3.9 +- Build with KSP 1.0.20, Kotlin 1.9.23, Ktor 2.3.10 1.12.0 - 2024-01-16 ======================================== diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0e1e0cf19..c5fc01889 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,10 +8,10 @@ junit = "4.13.2" kctfork = "0.4.0" kotlin = "1.9.23" kotlinPoet = "1.16.0" -kspVersion = "1.9.23-1.0.19" +kspVersion = "1.9.23-1.0.20" ktorfit = "1.13.0" ktorfitGradlePlugin = "1.12.0" -ktorVersion = "2.3.9" +ktorVersion = "2.3.10" mockk = "1.13.8" mockito-kotlin = "4.1.0" gradleMavenPublishPlugin = "0.25.3" diff --git a/mkdocs.yml b/mkdocs.yml index c0ce650da..daf1cb03b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -15,7 +15,7 @@ extra: ktorfit: release: "1.13.0" ktor: - release: "2.3.9" + release: "2.3.10" social: - icon: fontawesome/brands/github-alt link: 'https://github.com/foso' From c94c897d19d9e6be4cf042e9bedde87faa8571b0 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 14 Apr 2024 22:13:21 +0200 Subject: [PATCH 6/8] Update example projects --- example/AndroidOnlyExample/app/build.gradle.kts | 10 +++++----- example/AndroidOnlyExample/build.gradle | 2 +- .../MultiplatformExample/androidApp/build.gradle.kts | 6 +++--- example/MultiplatformExample/build.gradle.kts | 4 ++-- example/MultiplatformExample/shared/build.gradle.kts | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index c34b24424..7749dcba6 100644 --- a/example/AndroidOnlyExample/app/build.gradle.kts +++ b/example/AndroidOnlyExample/app/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("com.google.devtools.ksp") version "1.9.23-1.0.19" + id("com.google.devtools.ksp") version "1.9.23-1.0.20" id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23" - id("de.jensklingenberg.ktorfit") version "1.12.0" + id("de.jensklingenberg.ktorfit") version "1.13.0" } @@ -41,7 +41,7 @@ android { compose = (true) } composeOptions { - kotlinCompilerExtensionVersion = "1.5.8" + kotlinCompilerExtensionVersion = "1.5.11" } } @@ -51,8 +51,8 @@ tasks.withType().configureEach } } -val ktorfit = "1.12.0" -val ktor = "2.3.6" +val ktorfit = "1.13.0" +val ktor = "2.3.10" val compose_ui_version = "1.5.1" dependencies { ksp("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfit") diff --git a/example/AndroidOnlyExample/build.gradle b/example/AndroidOnlyExample/build.gradle index 03fa2eb8b..e2e73a856 100644 --- a/example/AndroidOnlyExample/build.gradle +++ b/example/AndroidOnlyExample/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '8.0.2' apply false id 'com.android.library' version '8.0.2' apply false - id 'org.jetbrains.kotlin.android' version '1.9.22' apply false + id 'org.jetbrains.kotlin.android' version '1.9.23' apply false } \ No newline at end of file diff --git a/example/MultiplatformExample/androidApp/build.gradle.kts b/example/MultiplatformExample/androidApp/build.gradle.kts index 3d318a88a..e25a9ddce 100644 --- a/example/MultiplatformExample/androidApp/build.gradle.kts +++ b/example/MultiplatformExample/androidApp/build.gradle.kts @@ -4,11 +4,11 @@ plugins { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "com.example.myapplication.android" minSdk = 21 - targetSdk = 33 + targetSdk = 34 versionCode = 1 versionName = "1.0" } @@ -21,6 +21,6 @@ android { dependencies { implementation(project(":shared")) - implementation("com.google.android.material:material:1.9.0") + implementation("com.google.android.material:material:1.11.0") implementation("androidx.appcompat:appcompat:1.6.1") } \ No newline at end of file diff --git a/example/MultiplatformExample/build.gradle.kts b/example/MultiplatformExample/build.gradle.kts index 39aa5315d..36866adfa 100644 --- a/example/MultiplatformExample/build.gradle.kts +++ b/example/MultiplatformExample/build.gradle.kts @@ -9,9 +9,9 @@ buildscript { } } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23") classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.22") + classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.23") } } diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index 1bbc8fd22..258d3f86f 100644 --- a/example/MultiplatformExample/shared/build.gradle.kts +++ b/example/MultiplatformExample/shared/build.gradle.kts @@ -2,14 +2,14 @@ plugins { kotlin("multiplatform") kotlin("native.cocoapods") id("com.android.library") - id("com.google.devtools.ksp") version "1.9.22-1.0.16" + id("com.google.devtools.ksp") version "1.9.23-1.0.20" id("kotlinx-serialization") - id("de.jensklingenberg.ktorfit") version "1.12.0" + id("de.jensklingenberg.ktorfit") version "1.13.0" } version = "1.0" -val ktorVersion = "2.3.6" -val ktorfitVersion = "1.12.0" +val ktorVersion = "2.3.10" +val ktorfitVersion = "1.13.0" kotlin { jvmToolchain(8) From 2b31f5ce4397fbd53042b385a216a0368475e096 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Sun, 14 Apr 2024 22:48:04 +0200 Subject: [PATCH 7/8] Update to Kotlin 2.0.0-RC1 (#535) --- docs/CHANGELOG.md | 4 ++++ gradle/libs.versions.toml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 942557c29..157f0acc5 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,6 +7,10 @@ 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. +1.14.0 - +======================================== +- Build with KSP 1.0.20, Kotlin 2.0.0-RC1, Ktor 2.3.10 + 1.13.0 - 2024-04-14 ======================================== - Build with KSP 1.0.20, Kotlin 1.9.23, Ktor 2.3.10 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c5fc01889..ef56288e3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,10 +5,10 @@ binaryCompatibilityValidator = "0.13.2" coroutines = "1.7.3" detekt = "1.23.1" junit = "4.13.2" -kctfork = "0.4.0" -kotlin = "1.9.23" +kctfork = "0.4.1" +kotlin = "2.0.0-RC1" kotlinPoet = "1.16.0" -kspVersion = "1.9.23-1.0.20" +kspVersion = "2.0.0-RC1-1.0.20" ktorfit = "1.13.0" ktorfitGradlePlugin = "1.12.0" ktorVersion = "2.3.10" From 34bb973b1b6979e7f3b639e8e4e2304586b0f9a4 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Mon, 15 Apr 2024 21:20:59 +0200 Subject: [PATCH 8/8] Release 1.14.0 (#536) --- docs/CHANGELOG.md | 2 +- docs/index.md | 21 +++++++++---------- .../AndroidOnlyExample/app/build.gradle.kts | 4 ++-- .../shared/build.gradle.kts | 6 +++--- gradle/libs.versions.toml | 2 +- .../gradle/KtorfitGradleConfiguration.kt | 2 +- mkdocs.yml | 2 +- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 157f0acc5..68dfcda6f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,7 +7,7 @@ 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. -1.14.0 - +1.14.0 - 2024-04-15 ======================================== - Build with KSP 1.0.20, Kotlin 2.0.0-RC1, Ktor 2.3.10 diff --git a/docs/index.md b/docs/index.md index 3dd762266..f8d96ac99 100644 --- a/docs/index.md +++ b/docs/index.md @@ -15,17 +15,16 @@ inspired by [Retrofit](https://square.github.io/retrofit/) ## Compatibility -| Ktorfit-version | Kotlin | KSP | Ktor | -|--------------------------|:-------------------------:|:-----------------------:|:---------:| -| **_1.13.0_** | **1.9.23** | **1.0.19** | **2.3.9** | -| **_1.12.0_** | **1.9.22** | **1.0.16** | **2.3.6** | -| **_1.11.0_** | **1.9.21** | **1.0.15** | **2.3.6** | -| **_1.10.2_** | **1.9.20** | **1.0.14** | **2.3.6** | -| **_1.10.1_** | **1.9.20** | **1.0.14** | **2.3.4** | -| **_1.10.0_** | **1.9.20** | **1.0.14** | **2.3.4** | -| **_1.9.1_** | **1.9.10 / 1.9.20-RC** | **1.0.13** | **2.3.4** | -| **_1.8.1_** | **1.9.10 / 1.9.20-Beta2** | **1.0.13** | **2.3.4** | -| **_1.7.0-1.9.20-Beta2_** | **1.9.20-Beta2** | **1.9.20-Beta2-1.0.13** | **2.3.4** | +| Ktorfit-version | Kotlin | KSP | Ktor | +|--------------------------|:-------------------------:|:-----------------------:|:----------:| +| **_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** | +| **_1.11.0_** | **1.9.21** | **1.0.15** | **2.3.6** | +| **_1.10.2_** | **1.9.20** | **1.0.14** | **2.3.6** | +| **_1.10.1_** | **1.9.20** | **1.0.14** | **2.3.4** | +| **_1.10.0_** | **1.9.20** | **1.0.14** | **2.3.4** | + # Installation diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index 7749dcba6..df274e7cb 100644 --- a/example/AndroidOnlyExample/app/build.gradle.kts +++ b/example/AndroidOnlyExample/app/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("org.jetbrains.kotlin.android") id("com.google.devtools.ksp") version "1.9.23-1.0.20" id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23" - id("de.jensklingenberg.ktorfit") version "1.13.0" + id("de.jensklingenberg.ktorfit") version "1.14.0" } @@ -51,7 +51,7 @@ tasks.withType().configureEach } } -val ktorfit = "1.13.0" +val ktorfit = "1.14.0" val ktor = "2.3.10" val compose_ui_version = "1.5.1" dependencies { diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index 258d3f86f..ddbcf4c0a 100644 --- a/example/MultiplatformExample/shared/build.gradle.kts +++ b/example/MultiplatformExample/shared/build.gradle.kts @@ -4,12 +4,12 @@ plugins { id("com.android.library") id("com.google.devtools.ksp") version "1.9.23-1.0.20" id("kotlinx-serialization") - id("de.jensklingenberg.ktorfit") version "1.13.0" + id("de.jensklingenberg.ktorfit") version "1.14.0" } version = "1.0" val ktorVersion = "2.3.10" -val ktorfitVersion = "1.13.0" +val ktorfitVersion = "1.14.0" kotlin { jvmToolchain(8) @@ -40,7 +40,7 @@ kotlin { dependencies { implementation("de.jensklingenberg.ktorfit:ktorfit-lib:$ktorfitVersion") //implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:$ktorfitVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") //Only needed when you want to use Kotlin Serialization implementation("io.ktor:ktor-client-serialization:$ktorVersion") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ef56288e3..88a20616f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ kctfork = "0.4.1" kotlin = "2.0.0-RC1" kotlinPoet = "1.16.0" kspVersion = "2.0.0-RC1-1.0.20" -ktorfit = "1.13.0" +ktorfit = "1.14.0" ktorfitGradlePlugin = "1.12.0" ktorVersion = "2.3.10" mockk = "1.13.8" diff --git a/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt b/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt index fc1509e19..f690b2d5b 100644 --- a/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt +++ b/ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt @@ -10,7 +10,7 @@ open class KtorfitGradleConfiguration { * version number of the compiler plugin */ @Deprecated("Update the Gradle plugin instead of updating this version") - var version: String = "1.12.0" // remember to bump this version before any release! + var version: String = "1.14.0" // remember to bump this version before any release! /** * used to get debug information from the compiler plugin diff --git a/mkdocs.yml b/mkdocs.yml index daf1cb03b..8691cd8e9 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,7 +13,7 @@ extra: site: images: '../../images' ktorfit: - release: "1.13.0" + release: "1.14.0" ktor: release: "2.3.10" social: