Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

foso/ksp1.0.26 #725

Closed
wants to merge 6 commits into from
Closed

foso/ksp1.0.26 #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b73a81d
Ksp 1.0.26
Foso Nov 5, 2024
056d29b
Ksp 1.0.26
Foso Nov 5, 2024
fd7be88
Merge branch 'master' into foso/ksp1.0.26
Foso Nov 5, 2024
9823636
Ksp 1.0.26
Foso Nov 5, 2024
d1e7917
Merge remote-tracking branch 'origin/foso/ksp1.0.26' into foso/ksp1.0.26
Foso Nov 5, 2024
5b2079e
Ksp 1.0.26
Foso Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions example/AndroidOnlyExample/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ android {
targetCompatibility(JavaVersion.VERSION_1_8)
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
buildFeatures {
compose = (true)
Expand All @@ -48,7 +48,7 @@ android {

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}

Expand Down
2 changes: 1 addition & 1 deletion example/MultiplatformExample/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android {
}

kotlinOptions {
jvmTarget= "1.8"
jvmTarget= "11"
}
}

Expand Down
2 changes: 1 addition & 1 deletion example/MultiplatformExample/person/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ android {

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
allWarningsAsErrors = false
}
}
Expand Down
4 changes: 2 additions & 2 deletions example/MultiplatformExample/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose it was a mistake

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes that was a mistake. But it's only in the example project and not part of the ksp plugin

implementation("de.jensklingenberg.ktorfit:ktorfit-converters-response:$ktorfitVersion")
implementation("de.jensklingenberg.ktorfit:ktorfit-converters-call:$ktorfitVersion")
implementation("de.jensklingenberg.ktorfit:ktorfit-converters-flow:$ktorfitVersion")
Expand Down Expand Up @@ -88,7 +88,7 @@ android {

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
allWarningsAsErrors = false
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions ktorfit-annotations/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ licensee {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

kotlin {
@OptIn(ExperimentalWasmDsl::class)
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
wasmJs()
jvm {
}
Expand Down
4 changes: 2 additions & 2 deletions ktorfit-compiler-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ publishing {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}
2 changes: 1 addition & 1 deletion ...fit-compiler-plugin/src/test/kotlin/de/jensklingenberg/ktorfit/FunctionTransformerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ fun <T> 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
}

Expand Down
2 changes: 1 addition & 1 deletion ktorfit-converters/call/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ mavenPublishing {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion ktorfit-converters/flow/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ mavenPublishing {
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion ktorfit-converters/response/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ mavenPublishing {
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

kotlin {
Expand Down
4 changes: 2 additions & 2 deletions ktorfit-gradle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ allprojects {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}

Expand All @@ -30,7 +30,7 @@ dependencies {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions ktorfit-ksp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {
}
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}

Expand All @@ -25,7 +25,7 @@ licensee {
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

mavenPublishing {
Expand Down
6 changes: 3 additions & 3 deletions ktorfit-lib-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}

Expand All @@ -35,7 +35,7 @@ ktlint {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

licensee {
Expand Down Expand Up @@ -76,7 +76,7 @@ mavenPublishing {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion ktorfit-lib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ mavenPublishing {
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

kotlin {
Expand Down
6 changes: 3 additions & 3 deletions sandbox/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ licensee {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(11))
}
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}
kotlin {
jvm {
compilations.all {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}
withJava()
}
Expand Down
Loading