Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3073637d authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove kotlin.RequiresOptIn"

parents dc152770 a12b11d8

packages/SettingsLib/Spa/spa/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ android_library { 
    ],

    kotlincflags: [

        "-Xjvm-default=all",

        "-opt-in=kotlin.RequiresOptIn",

    ],

    min_sdk_version: "31",

}

packages/SettingsLib/Spa/spa/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ android { 
    }

    kotlinOptions {

        jvmTarget = '1.8'

        freeCompilerArgs = ["-Xjvm-default=all", "-opt-in=kotlin.RequiresOptIn"]

        freeCompilerArgs = ["-Xjvm-default=all"]

    }

    buildFeatures {

        compose true

packages/SettingsLib/Spa/testutils/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ android { 
    }

    kotlinOptions {

        jvmTarget = '1.8'

        freeCompilerArgs = ["-Xjvm-default=all", "-opt-in=kotlin.RequiresOptIn"]

        freeCompilerArgs = ["-Xjvm-default=all"]

    }

}

packages/SettingsLib/SpaPrivileged/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ android_library { 
    ],

    kotlincflags: [

        "-Xjvm-default=all",

        "-opt-in=kotlin.RequiresOptIn",

    ],

}

packages/SettingsLib/SpaPrivileged/tests/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -39,7 +39,4 @@ android_test { 
        "mockito-target-minus-junit4",

        "truth-prebuilt",

    ],

    kotlincflags: [

        "-opt-in=kotlin.RequiresOptIn",

    ],

}