diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index ddd187ea1..fd26b1699 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -29,7 +29,7 @@ OptIn annotations on interfaces and functions will now be propagated to the gene # [2.1.0]() * Supported Kotlin version: 2.0.0; 2.0.10; 2.0.20, 2.1.0-Beta1; 2.0.21-RC, 2.0.21 -* Supported KSP version: 1.0.24; 1.0.25 +* Supported KSP version: 1.0.24; 1.0.25, 1.0.26 * Ktor version: 2.3.12; 3.0.0 ## Added diff --git a/example/AndroidOnlyExample/app/build.gradle.kts b/example/AndroidOnlyExample/app/build.gradle.kts index 7b2ad76e6..37d4e5bd8 100644 --- a/example/AndroidOnlyExample/app/build.gradle.kts +++ b/example/AndroidOnlyExample/app/build.gradle.kts @@ -39,7 +39,7 @@ android { targetCompatibility(JavaVersion.VERSION_1_8) } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } buildFeatures { compose = (true) @@ -48,7 +48,7 @@ android { tasks.withType().configureEach { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } } diff --git a/example/MultiplatformExample/androidApp/build.gradle.kts b/example/MultiplatformExample/androidApp/build.gradle.kts index c680dd91d..464bb1c8f 100644 --- a/example/MultiplatformExample/androidApp/build.gradle.kts +++ b/example/MultiplatformExample/androidApp/build.gradle.kts @@ -25,7 +25,7 @@ android { } kotlinOptions { - jvmTarget= "1.8" + jvmTarget= "11" } } diff --git a/example/MultiplatformExample/person/build.gradle.kts b/example/MultiplatformExample/person/build.gradle.kts index 092634140..0f2253807 100644 --- a/example/MultiplatformExample/person/build.gradle.kts +++ b/example/MultiplatformExample/person/build.gradle.kts @@ -59,7 +59,7 @@ android { tasks.withType { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" allWarningsAsErrors = false } } diff --git a/example/MultiplatformExample/shared/build.gradle.kts b/example/MultiplatformExample/shared/build.gradle.kts index 7a7e897ee..68bf3273e 100644 --- a/example/MultiplatformExample/shared/build.gradle.kts +++ b/example/MultiplatformExample/shared/build.gradle.kts @@ -48,7 +48,7 @@ kotlin { implementation(project(":person")) implementation("de.jensklingenberg.ktorfit:ktorfit-lib:$ktorfitVersion") // implementation("de.jensklingenberg.ktorfit:ktorfit-lib-light:$ktorfitVersion") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:11.1") implementation("de.jensklingenberg.ktorfit:ktorfit-converters-response:$ktorfitVersion") implementation("de.jensklingenberg.ktorfit:ktorfit-converters-call:$ktorfitVersion") implementation("de.jensklingenberg.ktorfit:ktorfit-converters-flow:$ktorfitVersion") @@ -88,7 +88,7 @@ android { tasks.withType { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" allWarningsAsErrors = false } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ac40c5199..0a2e47ec2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,11 +8,11 @@ junit = "4.13.2" kctfork = "0.5.1" kotlin = "2.0.21" kotlinPoet = "1.18.1" -kspVersion = "2.0.21-1.0.25" +kspVersion = "2.0.21-1.0.26" groupId = "de.jensklingenberg.ktorfit" ktorfit = "2.1.0" -ktorfitKsp = "2.1.0-1.0.25" +ktorfitKsp = "2.1.0-1.0.26" ktorfitCompiler = "2.1.0-2.0.21" ktorfitCallConverter = "2.1.0" ktorfitFlowConverter = "2.1.0" diff --git a/ktorfit-annotations/build.gradle.kts b/ktorfit-annotations/build.gradle.kts index 2dcfd9a09..71733ba71 100644 --- a/ktorfit-annotations/build.gradle.kts +++ b/ktorfit-annotations/build.gradle.kts @@ -21,15 +21,15 @@ licensee { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } kotlin { - @OptIn(ExperimentalWasmDsl::class) + @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class) wasmJs() jvm { } diff --git a/ktorfit-compiler-plugin/build.gradle.kts b/ktorfit-compiler-plugin/build.gradle.kts index 066d85189..0ada10159 100644 --- a/ktorfit-compiler-plugin/build.gradle.kts +++ b/ktorfit-compiler-plugin/build.gradle.kts @@ -98,10 +98,10 @@ publishing { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } diff --git a/ktorfit-compiler-plugin/src/test/kotlin/de/jensklingenberg/ktorfit/FunctionTransformerTest.kt b/ktorfit-compiler-plugin/src/test/kotlin/de/jensklingenberg/ktorfit/FunctionTransformerTest.kt index acbfa97a1..4f9d20375 100644 --- a/ktorfit-compiler-plugin/src/test/kotlin/de/jensklingenberg/ktorfit/FunctionTransformerTest.kt +++ b/ktorfit-compiler-plugin/src/test/kotlin/de/jensklingenberg/ktorfit/FunctionTransformerTest.kt @@ -126,7 +126,7 @@ fun Ktorfit.create(ktorfitService: ClassProvider? = null): T { inheritClassPath = true sources = sourceFiles verbose = false - jvmTarget = JvmTarget.fromString(System.getProperty("rdt.jvmTarget", "1.8"))!!.description + jvmTarget = JvmTarget.fromString(System.getProperty("rdt.jvmTarget", "11"))!!.description supportsK2 = false } diff --git a/ktorfit-converters/call/build.gradle.kts b/ktorfit-converters/call/build.gradle.kts index 6026ea3f3..6f0d52c06 100644 --- a/ktorfit-converters/call/build.gradle.kts +++ b/ktorfit-converters/call/build.gradle.kts @@ -44,7 +44,7 @@ mavenPublishing { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } kotlin { diff --git a/ktorfit-converters/flow/build.gradle.kts b/ktorfit-converters/flow/build.gradle.kts index 70915565c..ccbe11986 100644 --- a/ktorfit-converters/flow/build.gradle.kts +++ b/ktorfit-converters/flow/build.gradle.kts @@ -45,7 +45,7 @@ mavenPublishing { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } kotlin { diff --git a/ktorfit-converters/response/build.gradle.kts b/ktorfit-converters/response/build.gradle.kts index 8e31bde96..1a92f7a71 100644 --- a/ktorfit-converters/response/build.gradle.kts +++ b/ktorfit-converters/response/build.gradle.kts @@ -45,7 +45,7 @@ mavenPublishing { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } kotlin { diff --git a/ktorfit-gradle-plugin/build.gradle.kts b/ktorfit-gradle-plugin/build.gradle.kts index e4769747a..3ef4fd1d4 100644 --- a/ktorfit-gradle-plugin/build.gradle.kts +++ b/ktorfit-gradle-plugin/build.gradle.kts @@ -21,7 +21,7 @@ allprojects { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } @@ -30,7 +30,7 @@ dependencies { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } dependencies { diff --git a/ktorfit-ksp/build.gradle.kts b/ktorfit-ksp/build.gradle.kts index 75284d5aa..9c0f59b8e 100644 --- a/ktorfit-ksp/build.gradle.kts +++ b/ktorfit-ksp/build.gradle.kts @@ -15,7 +15,7 @@ plugins { } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } @@ -25,7 +25,7 @@ licensee { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } mavenPublishing { diff --git a/ktorfit-lib-core/build.gradle.kts b/ktorfit-lib-core/build.gradle.kts index d06d09946..745cc14ee 100644 --- a/ktorfit-lib-core/build.gradle.kts +++ b/ktorfit-lib-core/build.gradle.kts @@ -17,7 +17,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } @@ -35,7 +35,7 @@ ktlint { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } licensee { @@ -76,7 +76,7 @@ mavenPublishing { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } kotlin { diff --git a/ktorfit-lib/build.gradle.kts b/ktorfit-lib/build.gradle.kts index 19262c00d..8bd6f9eb8 100644 --- a/ktorfit-lib/build.gradle.kts +++ b/ktorfit-lib/build.gradle.kts @@ -41,7 +41,7 @@ mavenPublishing { } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } kotlin { diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts index b0edb7a44..1e2926224 100644 --- a/sandbox/build.gradle.kts +++ b/sandbox/build.gradle.kts @@ -21,17 +21,17 @@ licensee { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } tasks.withType { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } kotlin { jvm { compilations.all { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } withJava() }