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

Jump to bottom

Improve runtime compatibility with kotlin 1.5.31 #7343

Merged
merged 2 commits into from Jun 21, 2022
Merged

Improve runtime compatibility with kotlin 1.5.31 #7343

merged 2 commits into from Jun 21, 2022

Commits on Jun 20, 2022

  1. Revert "Remove usage of toDuration() (square#7329)" 

    This reverts commit 2c93710, as
it doesn't actually solve the problem it was intending to solve.
    @staktrace
    staktrace committed Jun 20, 2022
    Copy the full SHA
    d2eefa7 View commit details
    Browse the repository at this point in the history

  2. Make jvm functions compatible with kotlin 1.5 runtime 

    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.
    @staktrace
    staktrace committed Jun 20, 2022
    Copy the full SHA
    e515439 View commit details
    Browse the repository at this point in the history