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

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

Merge "Set BUILD_TOOLS_VERSION for Spa"

parents f38f9e62 689f2d86

packages/SettingsLib/Spa/build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 


buildscript {

    ext {

        spa_min_sdk = 21

        spa_target_sdk = 33

        jetpack_compose_version = '1.3.0'

        BUILD_TOOLS_VERSION = "30.0.3"

        MIN_SDK = 21

        TARGET_SDK = 33

        jetpack_compose_version = '1.4.0-alpha01'

        jetpack_compose_compiler_version = '1.3.2'

    }

}

packages/SettingsLib/Spa/gallery/build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -21,12 +21,13 @@ plugins { 


android {

    namespace 'com.android.settingslib.spa.gallery'

    compileSdk spa_target_sdk

    compileSdk TARGET_SDK

    buildToolsVersion = BUILD_TOOLS_VERSION



    defaultConfig {

        applicationId "com.android.settingslib.spa.gallery"

        minSdk spa_min_sdk

        targetSdk spa_target_sdk

        minSdk MIN_SDK

        targetSdk TARGET_SDK

        versionCode 1

        versionName "1.0"

    }

packages/SettingsLib/Spa/spa/build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ plugins { 


android {

    namespace 'com.android.settingslib.spa'

    compileSdk spa_target_sdk

    compileSdk TARGET_SDK

    buildToolsVersion = BUILD_TOOLS_VERSION



    defaultConfig {

        minSdk spa_min_sdk

        targetSdk spa_target_sdk

        minSdk MIN_SDK

        targetSdk TARGET_SDK

    }



    sourceSets {

packages/SettingsLib/Spa/tests/build.gradle

+4 −4
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ plugins { 


android {

    namespace 'com.android.settingslib.spa.tests'

    compileSdk spa_target_sdk

    compileSdk TARGET_SDK

    buildToolsVersion = BUILD_TOOLS_VERSION



    defaultConfig {

        minSdk spa_min_sdk

        targetSdk spa_target_sdk

        minSdk MIN_SDK

        targetSdk TARGET_SDK



        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }
@@ -60,7 +61,6 @@ android { 
dependencies {

    androidTestImplementation project(":spa")

    androidTestImplementation project(":testutils")

    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.3"

    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$jetpack_compose_version"

    androidTestImplementation "com.google.truth:truth:1.1.3"

    androidTestImplementation "org.mockito:mockito-android:3.4.6"

packages/SettingsLib/Spa/testutils/build.gradle

+4 −3
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ plugins { 
}



android {

    compileSdk spa_target_sdk

    compileSdk TARGET_SDK

    buildToolsVersion = BUILD_TOOLS_VERSION



    defaultConfig {

        minSdk spa_min_sdk

        targetSdk spa_target_sdk

        minSdk MIN_SDK

        targetSdk TARGET_SDK

    }



    sourceSets {