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

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

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

parents 40992b0e ce50dd2c

packages/SettingsLib/Spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ val androidTop: String = File(rootDir, "../../../../..").canonicalPath 


allprojects {

    extra["androidTop"] = androidTop

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

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

}



subprojects {

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

+3 −3
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ 
#



[versions]

agp = "8.2.1"

compose-compiler = "1.5.1"

agp = "8.2.2"

compose-compiler = "1.5.8"

dexmaker-mockito = "2.28.3"

jvm = "17"

kotlin = "1.9.0"

kotlin = "1.9.22"

truth = "1.1.5"



[libraries]

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

+2 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ dependencies { 
    api("androidx.slice:slice-builders:1.1.0-alpha02")

    api("androidx.slice:slice-core:1.1.0-alpha02")

    api("androidx.slice:slice-view:1.1.0-alpha02")

    api("androidx.compose.material3:material3:1.2.0-beta02")

    api("androidx.compose.material3:material3:1.2.0-rc01")

    api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion")

    api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion")

    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.6")

    api("androidx.navigation:navigation-compose:2.8.0-alpha01")

    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")