69/kotlin 1.7.10 (#178)

* Updated compose to 1.2.0-rc02 * Updated to latest Deps Co-authored-by: kasem-sm <[email protected]>
kasem-sm · Jul 22, 2022 · b420b4f · b420b4f
1 parent 885e935
commit b420b4f
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 25 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ apply plugin: 'dagger.hilt.android.plugin'
 
 android {
 	defaultConfig {
-		versionCode = 2
-		versionName = "1.1"
+		versionCode = 3
+		versionName = "1.2"
 		applicationId "kasem.sm.slime"
 	}
 }
@@ -62,7 +62,7 @@ dependencies {
 	implementation Accompanist.navigationMaterial
 	implementation Accompanist.navigationAnimation
 
-	implementation "com.google.android.material:material:1.7.0-alpha02"
+	implementation "com.google.android.material:material:1.7.0-alpha03"
 
 	implementation Hilt.navigation
 

diff --git a/build.gradle b/build.gradle
@@ -43,16 +43,16 @@ def provideHiltDeps(project) {
 // Will later migrate to Ktor 2.0
 def provideKtorAndroidDeps(project) {
     project.dependencies {
-        implementation "io.ktor:ktor-client-android:2.0.2"
-        implementation "io.ktor:ktor-client-serialization:2.0.2"
-        implementation "io.ktor:ktor-client-content-negotiation:2.0.2"
-        implementation "io.ktor:ktor-serialization-kotlinx-json:2.0.2"
+        implementation "io.ktor:ktor-client-android:2.0.3"
+        implementation "io.ktor:ktor-client-serialization:2.0.3"
+        implementation "io.ktor:ktor-client-content-negotiation:2.0.3"
+        implementation "io.ktor:ktor-serialization-kotlinx-json:2.0.3"
     }
 }
 
 def provideUnitTestDeps(project) {
     project.dependencies {
-        testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.2")
+        testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
         testImplementation("com.google.truth:truth:1.1.3")
         testImplementation("junit:junit:4.13.2")
         testImplementation("app.cash.turbine:turbine:0.8.0")
@@ -62,12 +62,12 @@ def provideUnitTestDeps(project) {
 
 def provideUiTestDeps(project) {
     project.dependencies {
-        androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.2.0-rc01"
+        androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.0-alpha01"
         androidTestImplementation "androidx.test.ext:junit:1.1.4-alpha07"
         androidTestImplementation "androidx.test.espresso:espresso-core:3.5.0-alpha07"
         androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.1.1"
         androidTestImplementation "com.google.truth:truth:1.1.3"
-        debugImplementation "androidx.compose.ui:ui-test-manifest:1.2.0-rc01"
+        debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.0-alpha01"
     }
 }
 

diff --git a/buildSrc/src/main/java/Accompanist.kt b/buildSrc/src/main/java/Accompanist.kt
@@ -1,5 +1,5 @@
 object Accompanist {
-    private const val accompanistVersion = "0.24.11-rc"
+    private const val accompanistVersion = "0.24.13-rc"
     private const val prefix = "com.google.accompanist:accompanist"
 
     const val navigationAnimation =

diff --git a/buildSrc/src/main/java/Compose.kt b/buildSrc/src/main/java/Compose.kt
@@ -1,9 +1,9 @@
 object Compose {
     private const val compostActivity = "1.6.0-alpha05"
     private const val compostNavigation = "2.5.0-alpha01"
-    private const val composeVersion = "1.2.0-rc01"
-    private const val composeMaterial3Version = "1.0.0-alpha13"
-    const val composeCompiler = "1.2.0-rc01"
+    private const val composeVersion = "1.3.0-alpha01"
+    private const val composeMaterial3Version = "1.0.0-alpha14"
+    const val composeCompiler = "1.3.0-beta01"
 
     const val ui = "androidx.compose.ui:ui:$composeVersion"
     const val material = "androidx.compose.material:material:$composeVersion"

diff --git a/buildSrc/src/main/java/Hilt.kt b/buildSrc/src/main/java/Hilt.kt
@@ -1,5 +1,5 @@
 object Hilt {
-    private const val hiltVersion = "2.42"
+    private const val hiltVersion = "2.43"
 
     const val gradle = "com.google.dagger:hilt-android-gradle-plugin:$hiltVersion"
     const val library = "com.google.dagger:hilt-android:$hiltVersion"

diff --git a/buildSrc/src/main/java/Jetbrains.kt b/buildSrc/src/main/java/Jetbrains.kt
@@ -1,7 +1,7 @@
 object Jetbrains {
-    private const val kotlin = "1.6.21"
+    private const val kotlin = "1.7.10"
     private const val serializationGradleVersion = "1.6.0-RC2"
-    private const val serializationCoreVersion = "1.3.3"
+    private const val serializationCoreVersion = "1.4.0-RC"
 
     const val gradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"
 
@@ -12,10 +12,10 @@ object Jetbrains {
         "org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationCoreVersion"
 
     // Coroutines
-    const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.2"
+    const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4"
 
     // Ktor
-    private const val ktorVersion = "2.0.2"
+    private const val ktorVersion = "2.0.3"
     const val ktorJvm = "io.ktor:ktor-http-jvm:$ktorVersion"
     const val ktorUtils = "io.ktor:ktor-utils-jvm:$ktorVersion"
     const val ktorClientCore = "io.ktor:ktor-client-core-jvm:$ktorVersion"

diff --git a/buildSrc/src/main/java/Lifecycle.kt b/buildSrc/src/main/java/Lifecycle.kt
@@ -1,5 +1,5 @@
 object Lifecycle {
-    private const val version = "2.5.0-rc02"
+    private const val version = "2.6.0-alpha01"
 
     const val runtime = "androidx.lifecycle:lifecycle-runtime-ktx:$version"
     const val viewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"

diff --git a/common-test-utils/build.gradle.kts b/common-test-utils/build.gradle.kts
@@ -23,7 +23,7 @@ artifacts {
 
 dependencies {
 	// Test Libs
-	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1")
+	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3")
 	implementation("com.google.truth:truth:1.1.3")
 	implementation("junit:junit:4.13.2")
 

diff --git a/database/build.gradle b/database/build.gradle
@@ -38,9 +38,9 @@ dependencies {
 	// Instrumentation Test
 	androidTestImplementation "com.google.truth:truth:1.1.3"
 	androidTestImplementation 'junit:junit:4.13.2'
-	androidTestImplementation 'androidx.test:runner:1.5.0-alpha03'
+	androidTestImplementation 'androidx.test:runner:1.5.0-alpha04'
 	androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
-	androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1"
+	androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3"
 	androidTestImplementation 'com.google.dagger:hilt-android-testing:2.42'
 	kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.42'
 }
diff --git a/gradle/common.gradle b/gradle/common.gradle
@@ -18,7 +18,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        useIR = true
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
         freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
         freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"

diff --git a/gradle/non-compose.gradle b/gradle/non-compose.gradle
@@ -24,7 +24,6 @@ android {
     }
     kotlinOptions {
         jvmTarget = '1.8'
-        useIR = true
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
         freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
         freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview"