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

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

Merge "[Spa] Update gradle project setup" into main

parents 13453c13 0ea8b09f

packages/SettingsLib/Spa/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ plugins { 
    alias(libs.plugins.kotlin.android) apply false

}



val androidTop: String = File(rootDir, "../../../../..").canonicalPath

val androidTop: String = file("../../../../..").canonicalPath



allprojects {

    extra["androidTop"] = androidTop

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

    extra["jetpackComposeVersion"] = "1.9.0-alpha03"

}



subprojects {

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

+5 −10
Original line number Diff line number Diff line
@@ -29,18 +29,13 @@ android { 
        versionName = "1.0"

    }



    sourceSets {

    sourceSets.getByName("main") {

        kotlin.setSrcDirs(listOf("src"))

        res.setSrcDirs(listOf("res"))

        manifest.srcFile("AndroidManifest.xml")

    }

}

    buildFeatures {

        compose = true

    }

}



dependencies {

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

    implementation(project(":Spa"))

}

packages/SettingsLib/Spa/settings.gradle.kts

+6 −6
Original line number Diff line number Diff line
@@ -44,15 +44,15 @@ dependencyResolutionManagement { 
    }

}

rootProject.name = "SpaLib"

include(":Spa:spa")

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

include(":Spa")

project(":Spa").projectDir = file("spa")

include(":Spa:gallery")

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

project(":Spa:gallery").projectDir = file("gallery")

include(":Spa:testutils")

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

project(":Spa:testutils").projectDir = file("testutils")

include(":SettingsLib:Color")

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

project(":SettingsLib:Color").projectDir = file("../Color")



// Uncomment this for screenshot

// include(":Spa:screenshot")

// project(":Spa:screenshot").projectDir = File(rootDir, "screenshot")
 
 No newline at end of file
 
// project(":Spa:screenshot").projectDir = file("screenshot")

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

+10 −12
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ android { 
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

    }



    sourceSets {

    sourceSets.getByName("main") {

        kotlin.setSrcDirs(listOf("src"))

        res.setSrcDirs(listOf("res"))
@@ -41,7 +40,6 @@ android { 
        res.setSrcDirs(listOf("../tests/res"))

        manifest.srcFile("../tests/AndroidManifest.xml")

    }

    }

    buildTypes {

        getByName("debug") {

            enableAndroidTestCoverage = true
@@ -52,7 +50,7 @@ android { 
dependencies {

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

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

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

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

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

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

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

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

+4 −6
Original line number Diff line number Diff line
@@ -25,16 +25,14 @@ val jetpackComposeVersion: String? by extra 
android {

    namespace = "com.android.settingslib.spa.testutils"



    sourceSets {

    sourceSets.getByName("main") {

        kotlin.setSrcDirs(listOf("src"))

        manifest.srcFile("AndroidManifest.xml")

    }

}

}



dependencies {

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

    api(project(":Spa"))



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

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