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

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

Merge "[gradle] Add Spa prefix to the Spa projects" into main

parents 55a48be4 aaefe70d

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

+1 −1
Original line number Diff line number Diff line
@@ -42,5 +42,5 @@ android { 
}



dependencies {

    implementation(project(":spa"))

    implementation(project(":Spa:spa"))

}

packages/SettingsLib/Spa/settings.gradle.kts

+8 −5
Original line number Diff line number Diff line
@@ -44,11 +44,14 @@ dependencyResolutionManagement { 
    }

}

rootProject.name = "SpaLib"

include(":spa")

include(":gallery")

include(":testutils")

include(":SettingsLibColor")

project(":SettingsLibColor").projectDir = File(rootDir, "../Color")

include(":Spa:spa")

project(":Spa:spa").projectDir = File(rootDir, "spa")

include(":Spa:gallery")

project(":Spa:gallery").projectDir = File(rootDir, "gallery")

include(":Spa:testutils")

project(":Spa:testutils").projectDir = File(rootDir, "testutils")

include(":SettingsLib:Color")

project(":SettingsLib:Color").projectDir = File(rootDir, "../Color")



// Uncomment this for screenshot

// include(":screenshot")
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ android { 
}



dependencies {

    api(project(":SettingsLibColor"))

    api(project(":SettingsLib:Color"))

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

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

    api("androidx.compose.material:material-icons-extended:1.7.8")
@@ -66,7 +66,7 @@ dependencies { 
    debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion")

    implementation("com.airbnb.android:lottie-compose:6.5.2")



    androidTestImplementation(project(":testutils"))

    androidTestImplementation(project(":Spa:testutils"))

    androidTestImplementation(libs.dexmaker.mockito)

}

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ android { 
}



dependencies {

    api(project(":spa"))

    api(project(":Spa:spa"))



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

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