diff --git a/.idea/.gitignore b/.idea/.gitignore index 26d33521..8f4d545d 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,4 @@ # Default ignored files /shelf/ /workspace.xml +/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index cbdcc150..00000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index bc467e1b..732a4d9c 100644 --- 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 { 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 index e8948a0c..f7645193 100644 --- 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 { extensions.configure { 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 index e82018b0..012d8911 100644 --- 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"