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

Unverified Commit bd9008f8 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Bump Android Gradle Plugin 8.2.2 -> 8.5.2 and Android Tools 31.2.2 -> 31.5.2

parent c1a8f3a9

build-plugin/src/main/kotlin/AndroidExtension.kt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import com.android.build.api.dsl.CommonExtension 
import org.gradle.accessors.dm.LibrariesForLibs

import org.gradle.api.artifacts.dsl.DependencyHandler



internal fun CommonExtension<*, *, *, *, *>.configureSharedConfig() {

internal fun CommonExtension<*, *, *, *, *, *>.configureSharedConfig() {

    compileSdk = ThunderbirdProjectConfig.androidSdkCompile



    defaultConfig {
@@ -46,7 +46,7 @@ internal fun CommonExtension<*, *, *, *, *>.configureSharedConfig() { 
    }

}



internal fun CommonExtension<*, *, *, *, *>.configureSharedComposeConfig(libs: LibrariesForLibs) {

internal fun CommonExtension<*, *, *, *, *, *>.configureSharedComposeConfig(libs: LibrariesForLibs) {

    buildFeatures {

        compose = true

    }

gradle/libs.versions.toml

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
androidDesugar = "2.0.4"

androidMaterial = "1.12.0"

# AGP and tools should be updated together

androidGradlePlugin = "8.2.2"

androidTools = "31.2.2"

androidGradlePlugin = "8.5.2"

androidTools = "31.5.2"

androidxActivity = "1.8.2"

androidxAnnotation = "1.8.0"

androidxAppCompat = "1.6.1"