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

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

Merge "Upgrade Spa to Java 17" into udc-dev

parents fb32cc4b da57d5f7

packages/SettingsLib/Spa/spa/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ android { 
        }

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_11

        targetCompatibility JavaVersion.VERSION_11

        sourceCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

    }

    kotlinOptions {

        jvmTarget = '11'

        jvmTarget = '17'

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

    }

    buildFeatures {

packages/SettingsLib/Spa/testutils/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ android { 
        }

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_11

        targetCompatibility JavaVersion.VERSION_11

        sourceCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

    }

    kotlinOptions {

        jvmTarget = '11'

        jvmTarget = '17'

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

    }

    buildFeatures {