From 3bb9997ae24d832b72c9182f60359892628c58c8 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Tue, 7 Nov 2023 18:12:34 +0100 Subject: [PATCH] Release 1.10.0 (#478) --- README.md | 10 +++++----- docs/CHANGELOG.md | 5 ++++- docs/index.md | 1 + example/AndroidOnlyExample/app/build.gradle.kts | 6 +++--- example/MultiplatformExample/build.gradle.kts | 2 +- example/MultiplatformExample/shared/build.gradle.kts | 8 ++++---- gradle/libs.versions.toml | 2 +- .../ktorfit/gradle/KtorfitGradleConfiguration.kt | 2 +- .../de/jensklingenberg/ktorfit/model/ClassData.kt | 1 + mkdocs.yml | 2 +- 10 files changed, 22 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 0626ef2a1..3a94d09a2 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ build.gradle.kts: ```kotlin plugins { - id("de.jensklingenberg.ktorfit") version "1.9.1" + id("de.jensklingenberg.ktorfit") version "1.10.0" } ``` @@ -40,22 +40,22 @@ build.gradle ```kotlin plugins { - id("de.jensklingenberg.ktorfit") version "1.9.1" + id("de.jensklingenberg.ktorfit") version "1.10.0" } ``` KSP: ```kotlin -de.jensklingenberg.ktorfit:ktorfit-ksp:1.9.1 +de.jensklingenberg.ktorfit:ktorfit-ksp:1.10.0 ``` Ktorfit-lib/-light: ```kotlin -implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.9.1") +implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.10.0") or -implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.9.1") +implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.10.0") ``` ## 👷 Project Structure diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8f22fd0a1..0a81f3208 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,13 +7,16 @@ 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.10.0 - 2023-11-06 ======================================== +Compatible with KSP 1.0.14 and Kotlin 1.9.20 + ### Added - LinuxArm64 support [#475](https://github.com/Foso/Ktorfit/issues/475) ### Changed - KSP 1.0.14 required +- Optimized code generation 1.9.1 - 2023-10-22 ======================================== diff --git a/docs/index.md b/docs/index.md index bb43fe878..fc1da4d9e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -17,6 +17,7 @@ inspired by [Retrofit](https://square.github.io/retrofit/) | Ktorfit-version | Kotlin | KSP | Ktor | |--------------------------|:-------------------------:|:-----------------------:|:---------:| +| **_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** | diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index 969430315..817b5b3c9 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.10-1.0.13" + 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.9.1" + id("de.jensklingenberg.ktorfit") version "1.10.0" } @@ -51,7 +51,7 @@ tasks.withType().configureEach } } -val ktorfit = "1.9.1" +val ktorfit = "1.10.0" val ktor = "2.3.4" val compose_ui_version = "1.5.1" dependencies { diff --git a/example/MultiplatformExample/build.gradle.kts b/example/MultiplatformExample/build.gradle.kts index fd4c04a34..64aa22726 100644 --- a/example/MultiplatformExample/build.gradle.kts +++ b/example/MultiplatformExample/build.gradle.kts @@ -11,7 +11,7 @@ buildscript { dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20") classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.10") + classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.20") } } diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index 4a0d41733..963a09486 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.10-1.0.13" + id("com.google.devtools.ksp") version "1.9.20-1.0.14" id("kotlinx-serialization") - id("de.jensklingenberg.ktorfit") version "1.9.1" + id("de.jensklingenberg.ktorfit") version "1.10.0" } version = "1.0" val ktorVersion = "2.3.4" -val ktorfitVersion = "1.9.1" +val ktorfitVersion = "1.10.0" kotlin { jvmToolchain(8) @@ -93,7 +93,7 @@ dependencies { tasks.withType { kotlinOptions { jvmTarget = "1.8" - allWarningsAsErrors = true + allWarningsAsErrors = false } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e8a91d10a..a9f59fa2f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ kctfork = "0.3.2" kotlin = "1.9.20" kotlinPoet = "1.14.2" kspVersion = "1.9.20-1.0.14" -ktorfit = "KTORFIT-SNAPSHOT" +ktorfit = "1.10.0" ktorfitGradlePlugin = "1.8.1" ktorVersion = "2.3.4" 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 4b7b4b691..a8d05baaa 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 = "KTORFIT-SNAPSHOT" // remember to bump this version before any release! + var version: String = "1.10.0" // remember to bump this version before any release! /** * used to get debug information from the compiler plugin diff --git a/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/ClassData.kt b/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/ClassData.kt index 812262b93..e67fae56d 100644 --- a/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/ClassData.kt +++ b/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/ClassData.kt @@ -100,6 +100,7 @@ fun ClassData.getImplClassFileSource(resolver: Resolver): String { val converterProperty = PropertySpec.builder(converterHelper.objectName, converterHelper.toClassName()) .initializer("%T(${ktorfitClass.objectName})", converterHelper.toClassName()) + .addModifiers(KModifier.PRIVATE) .build() val implClassSpec = TypeSpec.classBuilder(implClassName) diff --git a/mkdocs.yml b/mkdocs.yml index ce5c8ebd4..1217263cb 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,7 +13,7 @@ extra: site: images: '../../images' ktorfit: - release: "1.9.1" + release: "1.10.0" ktor: release: "2.3.4" social: