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

Commit 2882280f authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Upgrade SpaLib AGP to 8.0.0" into udc-dev am: 9b198254 am: c01ec42b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22800060



Change-Id: I4e63d90f141cd13efdb526d9236644ba85f489c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9a44d20 c01ec42b

packages/SettingsLib/Spa/build.gradle

+14 −4
Original line number Original line Diff line number Diff line
@@ -14,17 +14,27 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





import org.jetbrains.kotlin.gradle.tasks.KotlinCompile



buildscript {

buildscript {

    ext {

    ext {

        BUILD_TOOLS_VERSION = "30.0.3"

        BUILD_TOOLS_VERSION = "30.0.3"

        MIN_SDK = 21

        MIN_SDK = 21

        TARGET_SDK = 33

        TARGET_SDK = 33

        jetpack_compose_version = '1.4.0-beta01'

        jetpack_compose_version = '1.4.0-beta01'

        jetpack_compose_compiler_version = '1.4.0'

        jetpack_compose_compiler_version = '1.4.4'

    }

    }

}

}

plugins {

plugins {

    id 'com.android.application' version '8.0.0-beta05' apply false

    id 'com.android.application' version '8.0.0' apply false

    id 'com.android.library' version '8.0.0-beta05' apply false

    id 'com.android.library' version '8.0.0' apply false

    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false

    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false

}

subprojects {

    tasks.withType(KotlinCompile).configureEach {

        kotlinOptions {

            jvmTarget = "17"

            freeCompilerArgs = ["-Xjvm-default=all"]

        }

    }

}
 
}

packages/SettingsLib/Spa/gallery/build.gradle

+2 −6
Original line number Original line Diff line number Diff line
@@ -42,12 +42,8 @@ android { 
        }

        }

    }

    }

    compileOptions {

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_11

        sourceCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_11

        targetCompatibility JavaVersion.VERSION_17

    }

    kotlinOptions {

        jvmTarget = '11'

        freeCompilerArgs = ["-Xjvm-default=all"]

    }

    }

    buildFeatures {

    buildFeatures {

        compose true

        compose true

packages/SettingsLib/Spa/spa/build.gradle

+1 −5
Original line number Original line Diff line number Diff line
@@ -51,10 +51,6 @@ android { 
        sourceCompatibility JavaVersion.VERSION_17

        sourceCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

    }

    }

    kotlinOptions {

        jvmTarget = '17'

        freeCompilerArgs = ["-Xjvm-default=all"]

    }

    buildFeatures {

    buildFeatures {

        compose true

        compose true

    }

    }
@@ -79,7 +75,7 @@ dependencies { 
    api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"

    api "androidx.compose.ui:ui-tooling-preview:$jetpack_compose_version"

    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.6.0-alpha07"

    api "androidx.navigation:navigation-compose:2.6.0-alpha08"

    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.7.0-alpha03"

    api "com.google.android.material:material:1.7.0-alpha03"

    debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version"

    debugApi "androidx.compose.ui:ui-tooling:$jetpack_compose_version"

packages/SettingsLib/Spa/testutils/build.gradle

+0 −4
Original line number Original line Diff line number Diff line
@@ -41,10 +41,6 @@ android { 
        sourceCompatibility JavaVersion.VERSION_17

        sourceCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

    }

    }

    kotlinOptions {

        jvmTarget = '17'

        freeCompilerArgs = ["-Xjvm-default=all"]

    }

    buildFeatures {

    buildFeatures {

        compose true

        compose true

    }

    }