From 4f97d6f7dc76b4367b5da680e9fc754af03c607e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 24 May 2022 10:14:39 +0530 Subject: [PATCH] android: revert back to target API 31 Revert "gradle: bump AndroidX libraries for Tiramisu compat" This reverts commit e364d0c64db4b7afe7675b4e8a6770dcd00cdd85. Revert "gradle: downgrade activity-compose" This reverts commit fcf94f40e90a3e7a04859eb966d492c6bf8baed0. Revert "build: upgrade to target Tiramisu" This reverts commit 026d2fdb3a40264d1527f521414db963bffbacbc. --- .../kotlin/dev.msfjarvis.claw.android-common.gradle.kts | 4 ++-- gradle.properties | 3 --- gradle/libs.versions.toml | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts b/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts index 65ad5578..9911c54c 100644 --- a/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts +++ b/build-logic/android-plugins/src/main/kotlin/dev.msfjarvis.claw.android-common.gradle.kts @@ -10,10 +10,10 @@ import com.android.build.gradle.TestedExtension import org.gradle.kotlin.dsl.findByType extensions.configure { - compileSdkVersion = "android-Tiramisu" + setCompileSdkVersion(31) defaultConfig { minSdk = 26 - targetSdkPreview = "Tiramisu" + targetSdk = 31 } extensions.findByType()?.run { diff --git a/gradle.properties b/gradle.properties index 722ee1c2..bc91470b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,9 +56,6 @@ android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false android.defaults.buildfeatures.shaders=false -# Disable warning about Tiramisu -android.suppressUnsupportedCompileSdk=Tiramisu - # Disable warnings about unsupported features, we know what we're doing android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings,android.sdk.channel diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1ebf437c..2c06daf1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,10 +16,10 @@ workmanager = "2.8.0-alpha02" [libraries] accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } accompanist-sysuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } -androidx-activity-compose = "androidx.activity:activity-compose:1.6.0-alpha03" -androidx-appcompat = "androidx.appcompat:appcompat:1.6.0-alpha03" +androidx-activity-compose = "androidx.activity:activity-compose:1.4.0" +androidx-appcompat = "androidx.appcompat:appcompat:1.4.0" androidx-browser = "androidx.browser:browser:1.4.0" -androidx-core-ktx = "androidx.core:core-ktx:1.9.0-alpha03" +androidx-core-ktx = "androidx.core:core-ktx:1.7.0" androidx-core-splashscreen = "androidx.core:core-splashscreen:1.0.0-beta02" androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt" } androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt" }