Merge branch 'hotfix/1.1.2'

mshdabiola · Feb 19, 2023 · c54058f · c54058f
2 parents eb4a763 + afe9694
commit c54058f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 22 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -32,10 +32,10 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 configureKotlinAndroid(this)
                 compileSdk = 33
                 defaultConfig.targetSdk = 33
-                compileSdkPreview = "UpsideDownCake"
+               // compileSdkPreview = "UpsideDownCake"
                 defaultConfig.minSdk = 24
-                defaultConfig.versionName = "1.1.0"
-                defaultConfig.versionCode = 9
+                defaultConfig.versionName = "1.1.2"
+                defaultConfig.versionCode = 10
 
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 defaultConfig.vectorDrawables {

diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -33,7 +33,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
                 compileSdk = 33
-                compileSdkPreview = "UpsideDownCake"
+              //  compileSdkPreview = "UpsideDownCake"
                 defaultConfig.minSdk = 24
                 defaultConfig.targetSdk = 33
                 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ admob = "21.5.0"
 androidDesugarJdkLibs = "2.0.2"
 androidGradlePlugin = "8.1.0-alpha05"
 androidx-compose-foundation = "1.4.0-beta01"
-androidxActivity = "1.8.0-alpha01"
+androidxActivity = "1.7.0-alpha04"
 androidxAppCompat = "1.6.1"
 androidxCompose = "1.4.0-beta01"
 androidxComposeBom = "2022.11.00"