diff options
author | Cole Faust <colefaust@google.com> | 2022-06-28 15:59:28 -0700 |
---|---|---|
committer | Steve Elliott <steell@google.com> | 2022-10-28 10:56:42 -0400 |
commit | 4963ba0ae9d1f35c382e659f7fd4b98f12487a1e (patch) | |
tree | 9e5a12ea108333c22a5ae26f7b177725b992cd16 | |
parent | 53eee30fe7306757e7215e6c7b91f4962c6d7e4f (diff) | |
download | kotlinx.coroutines-4963ba0ae9d1f35c382e659f7fd4b98f12487a1e.tar.gz |
Update sdk_version of kotlinx-coroutines
So that it compiles for Jvm version 11,
and doesn't hit issues inlining it's code
into other Jvm 11 code.
Bug: 239834928
Bug: 69160377
Bug: 236431222
Test: Treehugger
Change-Id: Ie15d315a4396c539b5d3f8c903252c990c5274c7
Merged-In: Ie15d315a4396c539b5d3f8c903252c990c5274c7
-rw-r--r-- | Android.bp | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -38,10 +38,8 @@ license { java_library { name: "kotlinx_coroutines", host_supported: true, - // This should be "core_current", but that causes nullability issues - // for returned platform types that are explicitly marked @Nullable in - // SDK 29 and current. - sdk_version: "28", + sdk_version: "core_current", + min_sdk_version: "28", srcs: ["kotlinx-coroutines-core/jvm/src/**/*.kt"], common_srcs: ["kotlinx-coroutines-core/common/src/**/*.kt"], exclude_srcs: [ @@ -71,7 +69,8 @@ java_library { java_library { name: "kotlinx_coroutines_android", - sdk_version: "28", + sdk_version: "current", + min_sdk_version: "28", srcs: ["ui/kotlinx-coroutines-android/src/**/*.kt"], java_resource_dirs: ["ui/kotlinx-coroutines-android/resources"], kotlincflags: [ @@ -111,7 +110,8 @@ java_library { java_library { name: "kotlinx-coroutines-core", host_supported: true, - sdk_version: "28", + sdk_version: "core_current", + min_sdk_version: "28", static_libs: ["kotlinx_coroutines"], apex_available: [ "//apex_available:platform", @@ -122,7 +122,8 @@ java_library { java_library { name: "kotlinx-coroutines-core-jvm", host_supported: true, - sdk_version: "28", + sdk_version: "core_current", + min_sdk_version: "28", static_libs: ["kotlinx_coroutines"], apex_available: [ "//apex_available:platform", @@ -132,7 +133,8 @@ java_library { java_library { name: "kotlinx-coroutines-android", - sdk_version: "28", + sdk_version: "current", + min_sdk_version: "28", static_libs: [ "kotlinx_coroutines_android", "kotlinx_coroutines", |