Skip to content

Set apiVersion and languageVersion to 2.0 to ensure backwards compatibility #9040

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −2
Open

Set apiVersion and languageVersion to 2.0 to ensure backwards compatibility #9040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,19 @@ subprojects {
}
}

// Configure all projects' source sets (jvm and kmp)
plugins.matching { it.javaClass.name.startsWith("org.jetbrains.kotlin") }.configureEach {
kotlinExtension.sourceSets {
// Exclude all test source sets (containing Test)
matching { !it.name.contains("Test", ignoreCase = true) }.all {
languageSettings {
apiVersion = "2.0"
languageVersion = "2.0"
}
}
}
}
Comment on lines +198 to +209
Copy link
Contributor

@Goooler Goooler Sep 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
// Configure all projects' source sets (jvm and kmp)
plugins.matching { it.javaClass.name.startsWith("org.jetbrains.kotlin") }.configureEach {
kotlinExtension.sourceSets {
// Exclude all test source sets (containing Test)
matching { !it.name.contains("Test", ignoreCase = true) }.all {
languageSettings {
apiVersion = "2.0"
languageVersion = "2.0"
}
}
}
}
tasks.withType<KotlinCompile>().configureEach {
if (name.contains("test")) return@configureEach // Skip test source sets.
compilerOptions {
// Pin language level to 2.0 to ensure compatibility with older Gradle versions and other libraries that depend on okhttp.
// https://docs.gradle.org/current/userguide/compatibility.html#kotlin
languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
}
}


val platform = System.getProperty("okhttp.platform", "jdk9")
val testJavaVersion = System.getProperty("test.java.version", "21").toInt()

Expand Down
2 changes: 1 addition & 1 deletion okhttp/api/android/okhttp.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@ public abstract interface class okhttp3/TrailersSource {
public static final field Companion Lokhttp3/TrailersSource$Companion;
public static final field EMPTY Lokhttp3/TrailersSource;
public abstract fun get ()Lokhttp3/Headers;
public fun peek ()Lokhttp3/Headers;
public abstract fun peek ()Lokhttp3/Headers;
}

public final class okhttp3/TrailersSource$Companion {
Expand Down
2 changes: 1 addition & 1 deletion okhttp/api/jvm/okhttp.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ public abstract interface class okhttp3/TrailersSource {
public static final field Companion Lokhttp3/TrailersSource$Companion;
public static final field EMPTY Lokhttp3/TrailersSource;
public abstract fun get ()Lokhttp3/Headers;
public fun peek ()Lokhttp3/Headers;
public abstract fun peek ()Lokhttp3/Headers;
}

public final class okhttp3/TrailersSource$Companion {
Expand Down
Loading