From 93aa71f3a2d2f64b8cc3dacbe2d506a094aa18de Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Tue, 16 Jan 2024 22:41:16 +0100 Subject: [PATCH] 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