Remove kotlin.RequiresOptIn

Which is now enabled by default. Bug: 253772249 Test: Presubmit Change-Id: I799903c866a850b65aecbbae6100b267b5f8e754
2022-11-17 00:01:38 +08:00
parent 07e7541ea4
commit a12b11d82e
5 changed files with 2 additions and 7 deletions
--- a/packages/SettingsLib/Spa/spa/Android.bp
+++ b/packages/SettingsLib/Spa/spa/Android.bp
@@ -40,7 +40,6 @@ android_library {
    ],
    kotlincflags: [
        "-Xjvm-default=all",
-        "-opt-in=kotlin.RequiresOptIn",
    ],
    min_sdk_version: "31",
 }
--- a/packages/SettingsLib/Spa/spa/build.gradle
+++ b/packages/SettingsLib/Spa/spa/build.gradle
@@ -44,7 +44,7 @@ android {
    }
    kotlinOptions {
        jvmTarget = '1.8'
-        freeCompilerArgs = ["-Xjvm-default=all", "-opt-in=kotlin.RequiresOptIn"]
+        freeCompilerArgs = ["-Xjvm-default=all"]
    }
    buildFeatures {
        compose true
--- a/packages/SettingsLib/Spa/testutils/build.gradle
+++ b/packages/SettingsLib/Spa/testutils/build.gradle
@@ -42,7 +42,7 @@ android {
    }
    kotlinOptions {
        jvmTarget = '1.8'
-        freeCompilerArgs = ["-Xjvm-default=all", "-opt-in=kotlin.RequiresOptIn"]
+        freeCompilerArgs = ["-Xjvm-default=all"]
    }
 }

--- a/packages/SettingsLib/SpaPrivileged/Android.bp
+++ b/packages/SettingsLib/SpaPrivileged/Android.bp
@@ -30,7 +30,6 @@ android_library {
    ],
    kotlincflags: [
        "-Xjvm-default=all",
-        "-opt-in=kotlin.RequiresOptIn",
    ],
 }

--- a/packages/SettingsLib/SpaPrivileged/tests/Android.bp
+++ b/packages/SettingsLib/SpaPrivileged/tests/Android.bp
@@ -39,7 +39,4 @@ android_test {
        "mockito-target-minus-junit4",
        "truth-prebuilt",
    ],
-    kotlincflags: [
-        "-opt-in=kotlin.RequiresOptIn",
-    ],
 }