Merge remote-tracking branch 'refs/remotes/origin/master' into foso/2…

….0.0 # Conflicts: # gradle/libs.versions.toml # ktorfit-gradle-plugin/src/main/java/de/jensklingenberg/ktorfit/gradle/KtorfitGradleConfiguration.kt
Foso · Apr 26, 2024 · 683333e · 683333e
2 parents 5170f79 + 34bb973
commit 683333e
Show file tree

Hide file tree

Showing 17 changed files with 63 additions and 53 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
       - name: Cache Gradle and wrapper
         uses: actions/cache@v3

diff --git a/README.md b/README.md
@@ -32,30 +32,30 @@ build.gradle.kts:
 
 ```kotlin
 plugins {
-    id("de.jensklingenberg.ktorfit") version "1.11.1"
+    id("de.jensklingenberg.ktorfit") version "1.12.0"
 }
 ```
 
 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
@@ -7,6 +7,19 @@ 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.14.0 - 2024-04-15
+========================================
+- Build with KSP 1.0.20, Kotlin 2.0.0-RC1, Ktor 2.3.10
+
+1.13.0 - 2024-04-14
+========================================
+- Build with KSP 1.0.20, Kotlin 1.9.23, Ktor 2.3.10
+
+1.12.0 - 2024-01-16
+========================================
+- Compatible with KSP 1.0.16 and Kotlin 1.9.22
+
+
 1.11.1 - 2023-12-21
 ========================================
 - Fix compile errors #505 #496

diff --git a/docs/index.md b/docs/index.md
@@ -15,15 +15,16 @@ inspired by [Retrofit](https://square.github.io/retrofit/)
 
 ## Compatibility
 
-| Ktorfit-version          |          Kotlin           |           KSP           |   Ktor    |
-|--------------------------|:-------------------------:|:-----------------------:|:---------:|
-| **_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** |
-| **_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** |
+| Ktorfit-version          |          Kotlin           |           KSP           |    Ktor    |
+|--------------------------|:-------------------------:|:-----------------------:|:----------:|
+| **_1.14.0_**             |       **2.0.0-RC1**       |       **1.0.20**        | **2.3.10** |
+| **_1.13.0_**             |        **1.9.23**         |       **1.0.20**        | **2.3.10** |
+| **_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**  |
+| **_1.10.0_**             |        **1.9.20**         |       **1.0.14**        | **2.3.4**  |
+
 
 # Installation
 

diff --git 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.23-1.0.20"
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23"
+    id("de.jensklingenberg.ktorfit") version "1.14.0"
 }
 
 
@@ -41,7 +41,7 @@ android {
         compose = (true)
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
+        kotlinCompilerExtensionVersion = "1.5.11"
     }
 }
 
@@ -51,8 +51,8 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
     }
 }
 
-val ktorfit = "1.11.1"
-val ktor = "2.3.6"
+val ktorfit = "1.14.0"
+val ktor = "2.3.10"
 val compose_ui_version = "1.5.1"
 dependencies {
     ksp("de.jensklingenberg.ktorfit:ktorfit-ksp:$ktorfit")

diff --git a/...AndroidOnlyExample/app/src/main/java/de/jensklingenberg/androidonlyexample/StarWarsApi.kt b/...AndroidOnlyExample/app/src/main/java/de/jensklingenberg/androidonlyexample/StarWarsApi.kt
@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.Flow
 interface StarWarsApi {
 
     companion object {
-        const val baseUrl = "https://swapi.dev/api/"
+        const val baseUrl = "https://swapi.info/api/"
     }
 
     @GET("people/{id}/")

diff --git 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.23' apply false
 }
diff --git 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")
 }
diff --git 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.23")
         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.23")
 
     }
 }

diff --git 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
diff --git a/example/MultiplatformExample/iosApp/Pods/Pods.xcodeproj/project.pbxproj b/example/MultiplatformExample/iosApp/Pods/Pods.xcodeproj/project.pbxproj
diff --git 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.23-1.0.20"
     id("kotlinx-serialization")
-    id("de.jensklingenberg.ktorfit") version "1.11.1"
+    id("de.jensklingenberg.ktorfit") version "1.14.0"
 }
 
 version = "1.0"
-val ktorVersion = "2.3.6"
-val ktorfitVersion = "1.11.1"
+val ktorVersion = "2.3.10"
+val ktorfitVersion = "1.14.0"
 
 kotlin {
     jvmToolchain(8)
@@ -40,7 +40,7 @@ kotlin {
             dependencies {
                 implementation("de.jensklingenberg.ktorfit:ktorfit-lib:$ktorfitVersion")
                 //implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:$ktorfitVersion")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
 
                 //Only needed when you want to use Kotlin Serialization
                 implementation("io.ktor:ktor-client-serialization:$ktorVersion")

diff --git a/.../MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/StarWarsApi.kt b/.../MultiplatformExample/shared/src/commonMain/kotlin/com/example/ktorfittest/StarWarsApi.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.Flow
 
 interface StarWarsApi {
     companion object {
-        const val baseUrl = "https://swapi.dev/api/"
+        const val baseUrl = "https://swapi.info/api/"
     }
 
     @GET("people/{id}/")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,22 +5,20 @@ binaryCompatibilityValidator = "0.13.2"
 coroutines = "1.7.3"
 detekt = "1.23.1"
 junit = "4.13.2"
-kctfork = "0.4.0"
-kotlin = "1.9.21"
-kotlinPoet = "1.15.1"
-kspVersion = "1.9.21-1.0.15"
-ktorVersion = "2.3.6"
-ktorfit = "2.0.0-SNAPSHOT"
-ktorfitGradlePlugin = "1.11.0"
-
-ktorVersion = "3.0.0-beta-1"
+kctfork = "0.4.1"
+kotlin = "2.0.0-RC1"
+kotlinPoet = "1.16.0"
+kspVersion = "2.0.0-RC1-1.0.20"
+ktorfit = "1.14.0"
+ktorfitGradlePlugin = "1.12.0"
+ktorVersion = "2.3.10"
 mockk = "1.13.8"
 mockito-kotlin = "4.1.0"
 gradleMavenPublishPlugin = "0.25.3"
 vannikMavenPublish = "0.25.3"
 
 [libraries]
-android-build-gradle = "com.android.tools.build:gradle:7.4.2"
+android-build-gradle = "com.android.tools.build:gradle:8.2.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" }
@@ -54,8 +52,6 @@ ktor-client-core-mingwx64 = { module = "io.ktor:ktor-client-core-mingwx64", vers
 ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktorVersion" }
 ktor-client-ios = { module = "io.ktor:ktor-client-ios", version.ref = "ktorVersion" }
 ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktorVersion" }
-ktor-client-wasm-js = "io.ktor:ktor-client-js-wasm-js:3.0.0-wasm2"
-ktor-client-wasm-json-js = "io.ktor:ktor-client-json-wasm-js:3.0.0-wasm2"
 
 ktor-client-json-js = { module = "io.ktor:ktor-client-json-js", version.ref = "ktorVersion" }
 ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktorVersion" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -13,9 +13,9 @@ extra:
   site:
     images: '../../images'
   ktorfit:
-    release: "1.10.1"
+    release: "1.14.0"
   ktor:
-    release: "2.3.4"
+    release: "2.3.10"
   social:
     - icon: fontawesome/brands/github-alt
       link: 'https://github.com/foso'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756

		COCOAPODS: 1.12.0
		COCOAPODS: 1.14.3