From 473304b88fc7bc7aab62a6a1b5b402949dbd3098 Mon Sep 17 00:00:00 2001 From: Jens Klingenberg Date: Thu, 24 Aug 2023 19:47:36 +0200 Subject: [PATCH] v1.6.0 --- README.md | 16 ++++++++-------- docs/CHANGELOG.md | 14 ++++++++++++++ example/AndroidOnlyExample/app/build.gradle.kts | 4 ++-- example/AndroidOnlyExample/build.gradle | 2 +- example/MultiplatformExample/build.gradle.kts | 2 +- .../MultiplatformExample/shared/build.gradle.kts | 6 +++--- gradle/libs.versions.toml | 16 +++++++++------- ktorfit-ksp/build.gradle.kts | 2 +- .../jensklingenberg/ktorfit/KtorfitProcessor.kt | 2 -- ...vtools.ksp.processing.SymbolProcessorProvider | 1 + mkdocs.yml | 4 ++-- 11 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 ktorfit-ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider diff --git a/README.md b/README.md index cd61357ce..3c1f43704 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,10 @@ Please see the documentation at [https://foso.github.io/Ktorfit/](https://foso.g | Version | Kotlin | KSP | Ktor | |--------------|:----------:|:----------:|:---------:| -| **_latest_** | **1.9.0** | **1.0.13** | **2.3.2** | -| **_1.4.4_** | **1.8.22** | **1.0.11** | **2.3.2** | +| **_latest_** | **1.9.10** | **1.0.13** | **2.3.3** | +| **_1.5.0_** | **1.9.0** | **1.0.13** | **2.3.2** | | **_1.4.3_** | **1.8.20** | **1.0.11** | **2.3.1** | -| **_1.4.0_** | **1.8.20** | **1.0.11** | **2.3.0** | + # Release @@ -38,7 +38,7 @@ plugins { } configure { - version = "1.5.0" + version = "1.6.0" } ``` @@ -49,21 +49,21 @@ plugins { } ktorfit{ - version = "1.5.0" + version = "1.6.0" } ``` KSP: ```kotlin -de.jensklingenberg.ktorfit:ktorfit-ksp:1.5.0 +de.jensklingenberg.ktorfit:ktorfit-ksp:1.6.0 ``` Ktorfit-lib/-light: ```kotlin -implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.5.0") +implementation("de.jensklingenberg.ktorfit:ktorfit-lib:1.6.0") or -implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.5.0") +implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:1.6.0") ``` diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e9b54757c..516c29b39 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -14,7 +14,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Fixed ### Security +1.6.0 - 2023-08-24 +======================================== + +### Added +### Changed +* KSP version 1.9.10-1.0.13 is now required +- Upgrade dependencies: Ktor 2.3.3 + +### Deprecated +### Removed +### Fixed +### Security + 1.5.0 - 2023-08-04 +======================================== ### Added ### Changed diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index 0b15d6083..15a84f442 100644 --- a/example/AndroidOnlyExample/app/build.gradle.kts +++ b/example/AndroidOnlyExample/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { id("de.jensklingenberg.ktorfit") version "1.0.0" } -val ktorfit = "1.5.0" +val ktorfit = "1.6.0" configure { version = ktorfit @@ -54,7 +54,7 @@ tasks.withType().configureEach jvmTarget = "1.8" } } -val ktor = "2.3.2" +val ktor = "2.3.3" val compose_ui_version = "1.4.3" dependencies { ksp("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfit") diff --git a/example/AndroidOnlyExample/build.gradle b/example/AndroidOnlyExample/build.gradle index 2893c5fde..7c8e737b5 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.0' apply false + id 'org.jetbrains.kotlin.android' version '1.9.10' apply false } \ No newline at end of file diff --git a/example/MultiplatformExample/build.gradle.kts b/example/MultiplatformExample/build.gradle.kts index 7c8c55515..167d37e7c 100644 --- a/example/MultiplatformExample/build.gradle.kts +++ b/example/MultiplatformExample/build.gradle.kts @@ -8,7 +8,7 @@ buildscript { dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0") classpath("com.android.tools.build:gradle:7.3.1") - classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.0") + classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.10") } } diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index 4120cd3be..e6dcdf31e 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.0-1.0.13" + id("com.google.devtools.ksp") version "1.9.10-1.0.13" id("kotlinx-serialization") id("de.jensklingenberg.ktorfit") version "1.0.0" } version = "1.0" -val ktorVersion = "2.3.2" -val ktorfitVersion = "1.5.0" +val ktorVersion = "2.3.3" +val ktorfitVersion = "1.6.0" configure { version = ktorfitVersion diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 670f32d6c..e2fd9841b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,23 @@ [versions] autoService = "1.1.1" +autoServiceKsp = "1.10" coroutines = "1.7.3" detekt = "1.23.0" gradlePlugin = "1.0.0" -kctfork = "0.3.2" -kotlin = "1.9.0" +kctfork = "0.3.1" +kotlin = "1.9.10" kotlinPoet = "1.14.2" -kspVersion = "1.9.0-1.0.13" -ktorfit = "1.5.0" -ktorfit-lib = "1.5.0" -ktorVersion = "2.3.2" +kspVersion = "1.9.10-1.0.13" +ktorfit = "1.6.0" +ktorfit-lib = "1.6.0" +ktorVersion = "2.3.3" dokkaVersion = "1.8.20" -gradleMavenPublishPlugin = "0.24.0" +gradleMavenPublishPlugin = "0.25.3" vannikMavenPublish = "0.25.3" [libraries] android-build-gradle = "com.android.tools.build:gradle:7.4.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" } dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokkaVersion" } gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradleMavenPublishPlugin" } diff --git a/ktorfit-ksp/build.gradle.kts b/ktorfit-ksp/build.gradle.kts index c67bef807..93f284710 100644 --- a/ktorfit-ksp/build.gradle.kts +++ b/ktorfit-ksp/build.gradle.kts @@ -1,5 +1,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey") plugins { kotlin("jvm") @@ -26,7 +27,6 @@ tasks.withType { kotlinOptions.jvmTarget = "1.8" } -val enableSigning = project.hasProperty("ORG_GRADLE_PROJECT_signingInMemoryKey") mavenPublishing { coordinates("de.jensklingenberg.ktorfit", "ktorfit-ksp", libs.versions.ktorfit.asProvider().get()) publishToMavenCentral() diff --git a/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/KtorfitProcessor.kt b/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/KtorfitProcessor.kt index 4d091d2a2..2ee9691ee 100644 --- a/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/KtorfitProcessor.kt +++ b/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/KtorfitProcessor.kt @@ -1,6 +1,5 @@ package de.jensklingenberg.ktorfit -import com.google.auto.service.AutoService import com.google.devtools.ksp.closestClassDeclaration import com.google.devtools.ksp.processing.* import com.google.devtools.ksp.symbol.KSAnnotated @@ -9,7 +8,6 @@ import de.jensklingenberg.ktorfit.generator.generateImplClass import de.jensklingenberg.ktorfit.http.* import de.jensklingenberg.ktorfit.model.toClassData -@AutoService(SymbolProcessorProvider::class) class KtorfitProcessorProvider : SymbolProcessorProvider { override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor { return KtorfitProcessor(environment, KtorfitOptions(environment.options)) diff --git a/ktorfit-ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/ktorfit-ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider new file mode 100644 index 000000000..14158ad09 --- /dev/null +++ b/ktorfit-ksp/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider @@ -0,0 +1 @@ +de.jensklingenberg.ktorfit.KtorfitProcessorProvider \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index fd8ecc9cf..232ff9306 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,9 +13,9 @@ extra: site: images: '../../images' ktorfit: - release: "1.5.0" + release: "1.6.0" ktor: - release: "2.3.2" + release: "2.3.3" social: - icon: fontawesome/brands/github-alt link: 'https://github.com/foso'