aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-10-05 19:52:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-10-05 19:52:57 +0000
commit400ff95351f77a5c9520cf6db34e26f02e509cd8 (patch)
tree91f7a69fcee93c097c7768a9b489852924bde848
parentf174609ee266218cd339be41ebbae48973ff4c7d (diff)
parent614fe960d4342c43869a56e207247e77eaa93a81 (diff)
downloadkotlinx.coroutines-400ff95351f77a5c9520cf6db34e26f02e509cd8.tar.gz
Merge "Update arguments for kotlin 1.7.0"
-rw-r--r--Android.bp23
1 files changed, 12 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index 67eea5ae..eb9799a4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",