Set apiVersion and languageVersion to 2.0 for backwards compatibility#1690
Closed
hugoncosta wants to merge 1 commit intosquare:masterfrom
Closed
Set apiVersion and languageVersion to 2.0 for backwards compatibility#1690hugoncosta wants to merge 1 commit intosquare:masterfrom
hugoncosta wants to merge 1 commit intosquare:masterfrom
Conversation
fab61f7 to
70db5ce
Compare
70db5ce to
1d2a05a
Compare
Author
|
Similar to the OkHttp PR mentioned above, limiting the scope of this change by only ensuring that the source sets remain compatible with Kotlin 2.0 - tests, which are already using 2.1+ features (like the new Clock and Instant) can remain on the latest version. |
Goooler
reviewed
Oct 2, 2025
Comment on lines
+66
to
+73
| // Some sourceSets do not end with Test, easier to use the negative | ||
| matching { !it.name.endsWith("Test") }.all { | ||
| // Setting these to allow for backwards compatibility | ||
| languageSettings { | ||
| apiVersion = "2.0" | ||
| languageVersion = "2.0" | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| // Some sourceSets do not end with Test, easier to use the negative | |
| matching { !it.name.endsWith("Test") }.all { | |
| // Setting these to allow for backwards compatibility | |
| 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 | |
| } | |
| } |
Collaborator
There was a problem hiding this comment.
This caused some issues committing to the OkHttp PR
27 tasks
Contributor
|
You probably also want to set the |
Collaborator
|
Thanks for kicking this off. This has been fixed in #1770. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Following the discussion in square/okhttp#9032 and the PR in square/okhttp#9040, the purpose of this change is to ensure Okio remains compatible with Kotlin 2.0.
My change is only within the Okio package - to make the entire project compatible, there would need to be a few changes in other modules, more specifically adapting the usage of the new Kotlin Clock (see https://github.com/search?q=repo%3Asquare%2Fokio%20kotlin.time.Clock&type=code).