Update Compose compiler to 1.2.0, Kotlin and other dependencies

sebaslogen · Jul 3, 2022 · 86d66ed · 86d66ed
1 parent 29ce38c
commit 86d66ed
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/resaca/build.gradle b/resaca/build.gradle
@@ -7,11 +7,11 @@ plugins {
 group = 'com.github.sebaslogen'
 
 android {
-    compileSdk 31
+    compileSdk versions.compileSdk
 
     defaultConfig {
-        minSdk 21
-        targetSdk 31
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
         buildToolsVersion versions.buildTools
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/resacahilt/build.gradle b/resacahilt/build.gradle
@@ -9,11 +9,11 @@ plugins {
 group = 'com.github.sebaslogen'
 
 android {
-    compileSdk 31
+    compileSdk versions.compileSdk
 
     defaultConfig {
-        minSdk 21
-        targetSdk 31
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
         buildToolsVersion versions.buildTools
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -55,8 +55,8 @@ dependencies {
     // Compose dependencies
     implementation "androidx.compose.compiler:compiler:$versions.composeCompiler"
     // Integration with ViewModels
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$versions.lifecycleViewmodelCompose"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycleViewmodelKtx"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$versions.lifecycleViewmodel"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycleViewmodel"
 
     // Hilt dependencies
     implementation "androidx.hilt:hilt-navigation-compose:$versions.hiltNavigationCompose"

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -6,12 +6,12 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk versions.compileSdk
 
     defaultConfig {
         applicationId "com.sebaslogen.resacaapp"
-        minSdk 21
-        targetSdk 31
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
         buildToolsVersion versions.buildTools
         versionCode 1
         versionName "1.0"
@@ -34,7 +34,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        useIR = true
     }
     buildFeatures { // Enables Jetpack Compose for this module
         compose = true
@@ -63,8 +62,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$versions.lifecycleViewmodel"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$versions.kotlinxCoroutinesAndroid"
     implementation "androidx.activity:activity-compose:$versions.activityCompose"
 
@@ -76,7 +74,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling:$versions.composeUiTooling"
     implementation "androidx.compose.ui:ui-tooling-preview:$versions.composeUiTooling"
     // Integration with ViewModels
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$versions.lifecycleViewmodelCompose"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$versions.lifecycleViewmodel"
     // Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.)
     implementation "androidx.compose.foundation:foundation:$versions.composeFoundation"
     // Material Design

diff --git a/versions.gradle b/versions.gradle
@@ -2,17 +2,21 @@
 def versions = [:]
 
 versions.gradle = '7.2.1'
+versions.compileSdk = 31
+versions.minSdk = 21
+versions.targetSdk = 31
 versions.buildTools = "30.0.2"
-versions.kotlin = "1.6.10"
-versions.kotlinxCoroutinesAndroid = "1.6.1"
+versions.buildTools = "30.0.2"
+versions.kotlin = "1.7.0"
+versions.kotlinxCoroutinesAndroid = "1.6.3"
 versions.kotlinxCoroutinesTest = "1.6.3"
 versions.coreKtx = '1.8.0'
-versions.navigation = "2.4.2"
+versions.navigation = "2.5.0"
 versions.junit = "4.13.2"
 versions.robolectric = "4.7.3"
 
 // Compose
-versions.composeCompiler = "1.1.1"
+versions.composeCompiler = "1.2.0"
 versions.composeUi = "1.1.1"
 // Tooling support (Previews, etc.)
 versions.composeUiTooling = "1.1.1"
@@ -21,16 +25,14 @@ versions.composeFoundation = "1.1.1"
 // Material Design
 versions.composeMaterial = "1.1.1"
 // Integration with activities
-versions.activityCompose = "1.3.1"
+versions.activityCompose = "1.5.0"
 // Integration with ViewModels
-versions.lifecycleViewModel = '2.4.1'
-versions.activityCompose = "1.4.0"
+versions.lifecycleViewModel = '2.5.0'
 
 // Hilt
 versions.hiltGradlePlugin = '2.42'
 versions.hiltAndroid = '2.42'
 versions.hiltCompiler = '2.42'
 versions.hiltNavigationCompose = '1.0.0'
-versions.lifecycleViewmodelKtx = '2.4.1'
 
 ext.versions = versions