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

Commit aae615ff authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Upgrade kotlin to 1.8 

Also upgrade Jetpack Compose to 1.4.0-alpha05

Bug: 260441791
Test: Gradle Sync
Test: Run Gallery
Change-Id: Ib871ecfffaccf4e6a988a73da0ecf01e5be8e650
parent 08cde4d3

packages/SettingsLib/Spa/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ buildscript { 
        BUILD_TOOLS_VERSION = "30.0.3"

        MIN_SDK = 21

        TARGET_SDK = 33

        jetpack_compose_version = '1.4.0-alpha03'

        jetpack_compose_compiler_version = '1.3.2'

        jetpack_compose_version = '1.4.0-alpha05'

        jetpack_compose_compiler_version = '1.4.0'

    }

}

plugins {

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

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

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

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

}

packages/SettingsLib/Spa/spa/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ dependencies { 
    api "androidx.slice:slice-builders:1.1.0-alpha02"

    api "androidx.slice:slice-core:1.1.0-alpha02"

    api "androidx.slice:slice-view:1.1.0-alpha02"

    api "androidx.compose.material3:material3:1.1.0-alpha03"

    api "androidx.compose.material3:material3:1.1.0-alpha05"

    api "androidx.compose.material:material-icons-extended:$jetpack_compose_version"

    api "androidx.compose.runtime:runtime-livedata:$jetpack_compose_version"

    api "androidx.compose.runtime:runtime-livedata:1.4.0-alpha04"

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

    api "androidx.lifecycle:lifecycle-livedata-ktx:$jetpack_lifecycle_version"

    api "androidx.lifecycle:lifecycle-runtime-compose:$jetpack_lifecycle_version"