diff --git a/RELEASING.md b/RELEASING.md index 61943f9cb..b88297d71 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -8,12 +8,13 @@ Releasing 3. Update **ktorfitGradlePlugin** version inside `gradle/libs.versions.toml` 4. Update Compatibility table in Readme.md 5. Update ktorfit release version in mkdocs.yml -6. Set the release date in docs/changelog.md -7. `git commit -am "Release X.Y.Z."` (where X.Y.Z is the new version) -8. Push and create a PR to the `master` branch -9. When all checks successful, run GitHub Action `Publish Release` from your branch -10. Set the Git tag `git tag -a X.Y.Z -m "X.Y.Z"` (where X.Y.Z is the new version) -11. Merge the PR -12. Create a new release with for the Tag on GitHub -13. Run "deploy to GitHub pages" action -14. Put the relevant changelog in the release description \ No newline at end of file +6. Update version in KtorfitGradleConfiguration +7. Set the release date in docs/changelog.md +8. `git commit -am "Release X.Y.Z."` (where X.Y.Z is the new version) +9. Push and create a PR to the `master` branch +10. When all checks successful, run GitHub Action `Publish Release` from your branch +11. Set the Git tag `git tag -a X.Y.Z -m "X.Y.Z"` (where X.Y.Z is the new version) +12. Merge the PR +13. Create a new release with for the Tag on GitHub +14. Run "deploy to GitHub pages" action +15. Put the relevant changelog in the release description \ No newline at end of file diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e98341aae..fd98c42f1 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.9.1 - 2023-10-22 ======================================== +Compatible with KSP 1.0.13 and Kotlin 1.9.10/1.9.20-RC +When you are still using the Ktorfit Gradle plugin in version 1.0.0, please also update this to 1.9.1 + ### Added -- Add support for Tag annotation https://foso.github.io/Ktorfit/requests/#tag +- Add Tag annotation https://foso.github.io/Ktorfit/requests/#tag ### Changed -- Optimized generated code and suppressed unnecessary safe call warnings +- The generated code will not produce warnings anymore 1.8.1 - 2023-10-09 diff --git a/docs/index.md b/docs/index.md index e0cb557e4..bb43fe878 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.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** | | **_1.7.0_** | **1.9.10** | **1.0.13** | **2.3.4** | diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index de5169e01..969430315 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.10-1.0.13" id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10" - id("de.jensklingenberg.ktorfit") version "1.8.1" + id("de.jensklingenberg.ktorfit") version "1.9.1" } @@ -51,7 +51,7 @@ tasks.withType().configureEach } } -val ktorfit = "1.8.1" +val ktorfit = "1.9.1" 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 167d37e7c..1fe2ce2fd 100644 --- a/example/MultiplatformExample/build.gradle.kts +++ b/example/MultiplatformExample/build.gradle.kts @@ -4,6 +4,9 @@ buildscript { google() // mavenLocal() mavenCentral() + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + } } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0") @@ -18,5 +21,8 @@ allprojects { google() // mavenLocal() mavenCentral() + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots") + } } } diff --git a/example/MultiplatformExample/settings.gradle.kts b/example/MultiplatformExample/settings.gradle.kts index 7c1397f82..21c71e0a9 100644 --- a/example/MultiplatformExample/settings.gradle.kts +++ b/example/MultiplatformExample/settings.gradle.kts @@ -4,6 +4,9 @@ pluginManagement { gradlePluginPortal() mavenCentral() // mavenLocal() + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots/") + } } } diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index f3000bac7..4a0d41733 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.10-1.0.13" id("kotlinx-serialization") - id("de.jensklingenberg.ktorfit") version "1.8.1" + id("de.jensklingenberg.ktorfit") version "1.9.1" } version = "1.0" val ktorVersion = "2.3.4" -val ktorfitVersion = "1.8.1" +val ktorfitVersion = "1.9.1" kotlin { jvmToolchain(8) @@ -90,3 +90,17 @@ dependencies { } } +tasks.withType { + kotlinOptions { + jvmTarget = "1.8" + allWarningsAsErrors = true + } +} + +allprojects { + repositories { + maven { + url = uri("https://oss.sonatype.org/content/repositories/snapshots/") + } + } +} \ No newline at end of file diff --git a/example/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/Greeting.kt b/example/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/Greeting.kt index c8259b757..953f94724 100644 --- a/example/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/Greeting.kt +++ b/example/MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/Greeting.kt @@ -6,6 +6,7 @@ import de.jensklingenberg.ktorfit.ktorfit import io.ktor.client.HttpClient import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.serialization.kotlinx.json.json +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import kotlinx.serialization.json.Json @@ -36,6 +37,7 @@ class Greeting { } +@OptIn(DelicateCoroutinesApi::class) fun loadData() { GlobalScope.launch { val response = starWarsApi.getPersonByIdResponse(3) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 37e57f46f..f8b8a7118 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,7 @@ kctfork = "0.3.2" kotlin = "1.9.10" kotlinPoet = "1.14.2" kspVersion = "1.9.10-1.0.13" -ktorfit = "KTORFIT-SNAPSHOT" +ktorfit = "1.9.1" ktorfitGradlePlugin = "1.8.1" ktorVersion = "2.3.4" mockk = "1.13.8" @@ -22,6 +22,7 @@ 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" } gradle-maven-publish-plugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradleMavenPublishPlugin" } +kotlin-gradle-plugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" } ktorfit-gradle-plugin = { module = "de.jensklingenberg.ktorfit:gradle-plugin", version.ref = "ktorfitGradlePlugin" } junit = { module = "junit:junit", version.ref = "junit" } kctfork-core = { module = "dev.zacsweers.kctfork:core", version.ref = "kctfork" } diff --git a/ktorfit-gradle-plugin/build.gradle.kts b/ktorfit-gradle-plugin/build.gradle.kts index 7d437cc9b..ba1bd0609 100644 --- a/ktorfit-gradle-plugin/build.gradle.kts +++ b/ktorfit-gradle-plugin/build.gradle.kts @@ -34,7 +34,7 @@ tasks.withType { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.10") + implementation(libs.kotlin.gradle.plugin.api) } gradlePlugin { 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..499ffa8e8 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.9.1" // 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 654d5e166..ce5c8ebd4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -13,7 +13,7 @@ extra: site: images: '../../images' ktorfit: - release: "1.8.1" + release: "1.9.1" ktor: release: "2.3.4" social: diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts index 9e5ac39b2..d2956e305 100644 --- a/sandbox/build.gradle.kts +++ b/sandbox/build.gradle.kts @@ -3,8 +3,8 @@ plugins { alias(libs.plugins.kspPlugin) id("kotlinx-serialization") id("app.cash.licensee") + id("de.jensklingenberg.ktorfit") } -apply(plugin = "de.jensklingenberg.ktorfit") version = "1.0-SNAPSHOT" configure {