diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-10-05 21:14:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-05 21:14:53 +0000 |
| commit | 78ab32e1f2989d63cdea6261490409d6c9acbb0a (patch) | |
| tree | 91f7a69fcee93c097c7768a9b489852924bde848 | |
| parent | 6f482f240478db52df1a9e0ce6837e31466d56e7 (diff) | |
| parent | 773b5b1596c5e0d718dad770f71b1dec8b75fe4b (diff) | |
| download | kotlinx.coroutines-78ab32e1f2989d63cdea6261490409d6c9acbb0a.tar.gz | |
Merge "Update arguments for kotlin 1.7.0" am: 400ff95351 am: 65ad9a737a am: 773b5b1596
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529
Change-Id: I2a06f98d68f93bd6fe984e1af7e865a51ad3fd55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -52,13 +52,14 @@ java_library { ], kotlincflags: [ "-Xmulti-platform", - "-Xuse-experimental=kotlin.ExperimentalMultiplatform", - "-Xuse-experimental=kotlin.Experimental", - "-Xuse-experimental=kotlin.experimental.ExperimentalTypeInference", - "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi", - "-Xuse-experimental=kotlinx.coroutines.FlowPreview", - "-Xuse-experimental=kotlinx.coroutines.ObsoleteCoroutinesApi", - "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi", + "-opt-in=kotlin.RequiresOptIn", + "-opt-in=kotlin.experimental.ExperimentalTypeInference", + "-opt-in=kotlin.ExperimentalMultiplatform", + "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi", + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-opt-in=kotlinx.coroutines.ObsoleteCoroutinesApi", + "-opt-in=kotlinx.coroutines.InternalCoroutinesApi", + "-opt-in=kotlinx.coroutines.FlowPreview", ], apex_available: [ "//apex_available:platform", @@ -73,8 +74,8 @@ java_library { srcs: ["ui/kotlinx-coroutines-android/src/**/*.kt"], java_resource_dirs: ["ui/kotlinx-coroutines-android/resources"], kotlincflags: [ - "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi", - "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-opt-in=kotlinx.coroutines.InternalCoroutinesApi", + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", ], static_libs: [ "kotlinx_coroutines", @@ -94,8 +95,8 @@ java_library { srcs: ["kotlinx-coroutines-test/src/**/*.kt"], java_resource_dirs: ["kotlinx-coroutines-test/resources"], kotlincflags: [ - "-Xuse-experimental=kotlinx.coroutines.InternalCoroutinesApi", - "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi", + "-opt-in=kotlinx.coroutines.InternalCoroutinesApi", + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", ], libs: [ "kotlinx_coroutines", |