Update Kotlin version to 1.8, update related dependencies (android#8)

zsmb13 · web-flow · commit 916bda6a0cc6 · 2023-01-31T14:18:46.000+01:00
Change-Id: Icb832e3c938f0e0b2140c0eefcc169998966e192
diff --git a/DiceRoller/androidApp/build.gradle.kts b/DiceRoller/androidApp/build.gradle.kts
@@ -36,7 +36,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.3.2"
+        kotlinCompilerExtensionVersion = "1.4.0"
     }
 }
 
@@ -46,7 +46,7 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
     implementation("androidx.activity:activity-compose:1.6.1")
 
-    implementation(platform("androidx.compose:compose-bom:2022.10.00"))
+    implementation(platform("androidx.compose:compose-bom:2023.01.00"))
     debugImplementation("androidx.compose.ui:ui-tooling")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material:material")
diff --git a/DiceRoller/build.gradle.kts b/DiceRoller/build.gradle.kts
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0")
         classpath("com.android.tools.build:gradle:7.3.0")
     }
 }
diff --git a/DiceRoller/gradle.properties b/DiceRoller/gradle.properties
@@ -9,3 +9,4 @@ android.useAndroidX=true
 
 #MPP
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
diff --git a/DiceRoller/iosApp/Podfile b/DiceRoller/iosApp/Podfile
@@ -2,5 +2,5 @@ target 'iosApp' do
   use_frameworks!
   platform :ios, '14.1'
   pod 'shared', :path => '../shared'
-  pod 'KMPNativeCoroutinesAsync', '0.13.0'
+  pod 'KMPNativeCoroutinesAsync', '0.13.3'
 end
diff --git a/DiceRoller/iosApp/Podfile.lock b/DiceRoller/iosApp/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - KMPNativeCoroutinesAsync (0.13.0):
-    - KMPNativeCoroutinesCore (= 0.13.0)
-  - KMPNativeCoroutinesCore (0.13.0)
+  - KMPNativeCoroutinesAsync (0.13.3):
+    - KMPNativeCoroutinesCore (= 0.13.3)
+  - KMPNativeCoroutinesCore (0.13.3)
   - shared (1.0)
 
 DEPENDENCIES:
-  - KMPNativeCoroutinesAsync (= 0.13.0)
+  - KMPNativeCoroutinesAsync (= 0.13.3)
   - shared (from `../shared`)
 
 SPEC REPOS:
@@ -18,10 +18,10 @@ EXTERNAL SOURCES:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  KMPNativeCoroutinesAsync: 88f10d799cd3a0b3575140ef7dd231adec2bdf6b
-  KMPNativeCoroutinesCore: c8dc675c106e7a5e5387955bee6f94f7d72ea99f
+  KMPNativeCoroutinesAsync: 0fb5f7258e7b2bae50f03614a134bbbbfa3343ab
+  KMPNativeCoroutinesCore: 53c5b81bf7b74c556ce595931b3cdde87d6b2e45
   shared: d3e936b2c1df570cf43bf984e725cd24b68be937
 
-PODFILE CHECKSUM: 0267b88966d5fd74a845b73a21f300d280c05ef9
+PODFILE CHECKSUM: 20cbc8f6d669e90d09748fe15772591883d512bb
 
 COCOAPODS: 1.11.3
diff --git a/DiceRoller/shared/build.gradle.kts b/DiceRoller/shared/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("native.cocoapods")
     id("com.android.library")
-    id("com.rickclephas.kmp.nativecoroutines") version "0.13.1"
+    id("com.rickclephas.kmp.nativecoroutines") version "0.13.3"
 }
 
 version = "1.0"
@@ -53,7 +53,7 @@ kotlin {
             }
         }
         val androidMain by getting
-        val androidTest by getting
+        val androidUnitTest by getting
         val iosX64Main by getting
         val iosArm64Main by getting
         val iosSimulatorArm64Main by getting

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ android {`
`36`	`36`	`targetCompatibility = JavaVersion.VERSION_1_8`
`37`	`37`	`}`
`38`	`38`	`composeOptions {`
`39`		`- kotlinCompilerExtensionVersion = "1.3.2"`
	`39`	`+ kotlinCompilerExtensionVersion = "1.4.0"`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`@@ -46,7 +46,7 @@ dependencies {`
`46`	`46`	`implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")`
`47`	`47`	`implementation("androidx.activity:activity-compose:1.6.1")`
`48`	`48`
`49`		`- implementation(platform("androidx.compose:compose-bom:2022.10.00"))`
	`49`	`+ implementation(platform("androidx.compose:compose-bom:2023.01.00"))`
`50`	`50`	`debugImplementation("androidx.compose.ui:ui-tooling")`
`51`	`51`	`implementation("androidx.compose.ui:ui-tooling-preview")`
`52`	`52`	`implementation("androidx.compose.material:material")`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ buildscript {`
`20`	`20`	`mavenCentral()`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")`
	`23`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0")`
`24`	`24`	`classpath("com.android.tools.build:gradle:7.3.0")`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,4 @@ android.useAndroidX=true`
`9`	`9`
`10`	`10`	`#MPP`
`11`	`11`	`kotlin.mpp.enableCInteropCommonization=true`
	`12`	`+kotlin.mpp.androidSourceSetLayoutVersion=2`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ plugins {`
`17`	`17`	`kotlin("multiplatform")`
`18`	`18`	`kotlin("native.cocoapods")`
`19`	`19`	`id("com.android.library")`
`20`		`- id("com.rickclephas.kmp.nativecoroutines") version "0.13.1"`
	`20`	`+ id("com.rickclephas.kmp.nativecoroutines") version "0.13.3"`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`version = "1.0"`
`@@ -53,7 +53,7 @@ kotlin {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`val androidMain by getting`
`56`		`- val androidTest by getting`
	`56`	`+ val androidUnitTest by getting`
`57`	`57`	`val iosX64Main by getting`
`58`	`58`	`val iosArm64Main by getting`
`59`	`59`	`val iosSimulatorArm64Main by getting`