Improve runtime compatibility with kotlin 1.5.31 #7343
Merged
Conversation
This file contains 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
This reverts commit 2c93710, as it doesn't actually solve the problem it was intending to solve.
Based on the discovery in square#7329 (comment) this commit tries a different approach to make okhttp compatible with the kotlin 1.5 runtime. Specifically, it converts the DurationUnit instance to a java.util.concurrent.TimeUnit instance and uses the existing codepath to handle it. The conversion must be done without using `DurationUnit.toTimeUnit()` since that is again a function that would not exist in the 1.5 kotlin runtime environment.
yschimke
approved these changes
Jun 20, 2022
yschimke
reviewed
Jun 20, 2022
| @@ -50,20 +50,20 @@ internal fun CacheControl.commonToString(): String { | |||
|
|
|||
| internal fun CacheControl.Builder.commonMaxAge(maxAge: Int, timeUnit: DurationUnit) = apply { | |||
| require(maxAge >= 0) { "maxAge < 0: $maxAge" } | |||
| val maxAgeSecondsDouble = Duration.convert(maxAge.toDouble(), timeUnit, DurationUnit.SECONDS) | |||
| this.maxAgeSeconds = maxAgeSecondsDouble.commonClampToInt() | |||
| val maxAgeSecondsLong = maxAge.toDuration(timeUnit).inWholeSeconds | |||
There was a problem hiding this comment.
Nice, so this is reverting back to before these PRs.
yschimke
reviewed
Jun 20, 2022
| // to TimeUnit (as it was pre-1.6) and where it is a distinct wrapper enum (in 1.6). We also | ||
| // can't use durationUnit.toTimeUnit() because that doesn't exist in the typealiased case. | ||
| // This function should work in either case. | ||
| internal fun toJavaTimeUnit(durationUnit: DurationUnit) = TimeUnit.valueOf(durationUnit.name) |
There was a problem hiding this comment.
This doesn't look to bad, a lookup in a Hashmap, from a constant name (at least on JVM).
|
Confirmed that (finally!) this fixed the issue we were having. |
|
@staktrace a big hearty thanks for your efforts |
|
Here we go again! This PR fixed the issue we were having, but there's a new (but I guess) related issue. This one didn't get caught by the tests for our plugin (which is the thing that uses okhttp3) but started failing in repos that used the plugin. I'll try to construct a minimal test case for this that ideally we can check in, although who knows if there will be more problems after this that the test case doesn't capture. |
|
I made a standalone reproducer and filed #7361 |
yschimke
added a commit
to yschimke/okhttp
that referenced
this pull request
Jul 23, 2022
This reverts commit 3ff1b61
yschimke
added a commit
that referenced
this pull request
Jul 25, 2022
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.
I tried to fix this in #7329 but that didn't work. This reverts that attempt and applies a different fix that seems to work better. See individual commit messages for details.