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

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

Merge "[Spa] Upgrade Kotlin to 1.9.0" into main

parents 1d59911f ef4a221f

packages/SettingsLib/Spa/build.gradle.kts

+4 −3
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



import com.android.build.api.dsl.CommonExtension

import com.android.build.gradle.BaseExtension

import com.android.build.gradle.api.AndroidBasePlugin

import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -25,7 +26,7 @@ plugins { 
}



allprojects {

    extra["jetpackComposeVersion"] = "1.6.0-alpha01"

    extra["jetpackComposeVersion"] = "1.6.0-alpha02"

}



subprojects {
@@ -47,10 +48,10 @@ subprojects { 


    afterEvaluate {

        plugins.withType<AndroidBasePlugin> {

            configure<BaseExtension> {

            the(CommonExtension::class).apply {

                if (buildFeatures.compose == true) {

                    composeOptions {

                        kotlinCompilerExtensionVersion = "1.4.4"

                        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()

                    }

                }

            }

packages/SettingsLib/Spa/gradle/libs.versions.toml

+2 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


[versions]

agp = "8.1.0"

compose-compiler = "1.5.1"

dexmaker-mockito = "2.28.3"

kotlin = "1.8.10"

kotlin = "1.9.0"

truth = "1.1"



[libraries]

packages/SettingsLib/Spa/spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ dependencies { 
    api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion")

    api("androidx.lifecycle:lifecycle-livedata-ktx")

    api("androidx.lifecycle:lifecycle-runtime-compose")

    api("androidx.navigation:navigation-compose:2.7.0-beta01")

    api("androidx.navigation:navigation-compose:2.7.0-rc01")

    api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha")

    api("com.google.android.material:material:1.7.0-alpha03")

    debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion")