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

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

Merge "Upgrade Kotlin version to 1.7.20 for SpaLib"

parents 5ef5f517 649a850a

packages/SettingsLib/Spa/build.gradle

+2 −1
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ buildscript { 
    ext {

        spa_min_sdk = 21

        jetpack_compose_version = '1.2.0-alpha04'

        jetpack_compose_compiler_version = '1.3.2'

        jetpack_compose_material3_version = '1.0.0-alpha06'

    }

}

plugins {

    id 'com.android.application' version '7.3.0' apply false

    id 'com.android.library' version '7.3.0' apply false

    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false

    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false

}

packages/SettingsLib/Spa/gallery/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ android { 
        compose true

    }

    composeOptions {

        kotlinCompilerExtensionVersion jetpack_compose_version

        kotlinCompilerExtensionVersion jetpack_compose_compiler_version

    }

    packagingOptions {

        resources {

packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#Thu Jul 14 10:36:06 CST 2022

distributionBase=GRADLE_USER_HOME

distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip

distributionPath=wrapper/dists

zipStorePath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

packages/SettingsLib/Spa/spa/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ android_library { 
    ],

    kotlincflags: [

        "-Xjvm-default=all",

        "-Xopt-in=kotlin.RequiresOptIn",

        "-opt-in=kotlin.RequiresOptIn",

    ],

    min_sdk_version: "31",

}

packages/SettingsLib/Spa/spa/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ android { 
    }

    kotlinOptions {

        jvmTarget = '1.8'

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

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

    }

    buildFeatures {

        compose true

    }

    composeOptions {

        kotlinCompilerExtensionVersion jetpack_compose_version

        kotlinCompilerExtensionVersion jetpack_compose_compiler_version

    }

    packagingOptions {

        resources {