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

Commit 509d1523 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Update the versions" into main

parents 96fc6028 c340e322

packages/SettingsLib/Spa/build.gradle.kts

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




allprojects {

allprojects {

    extra["androidTop"] = androidTop

    extra["androidTop"] = androidTop

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

    extra["jetpackComposeVersion"] = "1.8.0-rc02"

}

}





subprojects {

subprojects {

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -15,14 +15,16 @@ 
#

#





[versions]

[versions]

agp = "8.9.0"

agp = "8.9.1"

dexmaker-mockito = "2.28.3"

dexmaker-mockito = "2.28.3"

jvm = "21"

jvm = "21"

kotlin = "2.1.10"

kotlin = "2.1.10"

mockito-kotlin = "4.1.0"

truth = "1.4.4"

truth = "1.4.4"





[libraries]

[libraries]

dexmaker-mockito = { module = "com.linkedin.dexmaker:dexmaker-mockito", version.ref = "dexmaker-mockito" }

dexmaker-mockito = { module = "com.linkedin.dexmaker:dexmaker-mockito", version.ref = "dexmaker-mockito" }

mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" }

truth = { module = "com.google.truth:truth", version.ref = "truth" }

truth = { module = "com.google.truth:truth", version.ref = "truth" }





[plugins]

[plugins]

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -52,14 +52,14 @@ android { 
dependencies {

dependencies {

    api(project(":SettingsLibColor"))

    api(project(":SettingsLibColor"))

    api("androidx.appcompat:appcompat:1.7.0")

    api("androidx.appcompat:appcompat:1.7.0")

    api("androidx.compose.material3:material3:1.4.0-alpha10")

    api("androidx.compose.material3:material3:1.4.0-alpha12")

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

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

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

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

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

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

    api("androidx.graphics:graphics-shapes-android:1.0.1")

    api("androidx.graphics:graphics-shapes-android:1.0.1")

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

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

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

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

    api("androidx.navigation:navigation-compose:2.9.0-alpha08")

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

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

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

    api("com.google.android.material:material:1.13.0-alpha08")

    api("com.google.android.material:material:1.13.0-alpha08")

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

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

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -39,12 +39,8 @@ dependencies { 
    api("androidx.arch.core:core-testing:2.2.0")

    api("androidx.arch.core:core-testing:2.2.0")

    api("androidx.compose.ui:ui-test-junit4:$jetpackComposeVersion")

    api("androidx.compose.ui:ui-test-junit4:$jetpackComposeVersion")

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

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

    api("org.mockito.kotlin:mockito-kotlin:2.2.11")

    api(libs.mockito.kotlin)

    api("org.mockito:mockito-core") {

    api("org.mockito:mockito-core:4.3.0")

        version {

            strictly("2.28.2")

        }

    }

    api(libs.truth)

    api(libs.truth)

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

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

}
 
}