From 3f2696485c1bab235666490fef1db35b3e2cc91d Mon Sep 17 00:00:00 2001 From: Benoit Billington Date: Sun, 14 Apr 2024 20:56:39 +0200 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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)