For mozilla-mobile#12489: Upgrade kotlin, coroutines, compose compiler to latest versions.

mcarare · mergify[bot] · commit 8877cc030cf9 · 2022-10-18T08:20:59.000Z
Upgrade kotlin to 1.7.20, coroutines to 1.6.4 and compose compiler to 1.3.2.
Replace deprecated Xopt-in with op-in.
Replace deprecated Xjvm-default=enable with Xjvm-default=all.
Remove useIR property that is now default true.
diff --git a/build.gradle b/build.gradle
@@ -258,9 +258,8 @@ subprojects {
                     kotlinOptions {
                         jvmTarget = "1.8"
                         freeCompilerArgs += [
-                            "-Xopt-in=kotlin.RequiresOptIn"
+                            "-opt-in=kotlin.RequiresOptIn"
                         ]
-                        useIR = true
                     }
                 }
             }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -7,8 +7,8 @@
 
 // Synchronized version numbers for dependencies used by (some) modules
 object Versions {
-    const val kotlin = "1.6.10"
-    const val coroutines = "1.6.1"
+    const val kotlin = "1.7.20"
+    const val coroutines = "1.6.4"
 
     const val junit = "4.13.2"
     const val robolectric = "4.9"
@@ -43,7 +43,7 @@ object Versions {
     // see https://android-developers.googleblog.com/2022/06/independent-versioning-of-Jetpack-Compose-libraries.html
     // for Jetpack Compose libraries versioning
     const val compose_version = "1.2.1"
-    const val compose_compiler = "1.1.1"
+    const val compose_compiler = "1.3.2"
 
     object AndroidX {
         const val activityCompose = "1.4.0"
diff --git a/components/browser/session-storage/build.gradle b/components/browser/session-storage/build.gradle
@@ -27,7 +27,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/browser/state/build.gradle b/components/browser/state/build.gradle
@@ -38,7 +38,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/browser/thumbnails/build.gradle b/components/browser/thumbnails/build.gradle
@@ -28,7 +28,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/compose/awesomebar/build.gradle b/components/compose/awesomebar/build.gradle
@@ -31,7 +31,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xjvm-default=enable"
+        freeCompilerArgs += "-Xjvm-default=all"
     }
 }
 
diff --git a/components/feature/accounts-push/build.gradle b/components/feature/accounts-push/build.gradle
@@ -29,7 +29,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/accounts/build.gradle b/components/feature/accounts/build.gradle
@@ -27,7 +27,7 @@ tasks.register("updateBuiltInExtensionVersion", Copy) { task ->
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/addons/build.gradle b/components/feature/addons/build.gradle
@@ -50,7 +50,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/app-links/build.gradle b/components/feature/app-links/build.gradle
@@ -29,7 +29,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/contextmenu/build.gradle b/components/feature/contextmenu/build.gradle
@@ -23,7 +23,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/customtabs/build.gradle b/components/feature/customtabs/build.gradle
@@ -23,7 +23,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/downloads/build.gradle b/components/feature/downloads/build.gradle
@@ -41,7 +41,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/findinpage/build.gradle b/components/feature/findinpage/build.gradle
@@ -23,7 +23,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/media/build.gradle b/components/feature/media/build.gradle
@@ -28,7 +28,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/prompts/build.gradle b/components/feature/prompts/build.gradle
@@ -24,7 +24,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/pwa/build.gradle b/components/feature/pwa/build.gradle
@@ -41,7 +41,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/readerview/build.gradle b/components/feature/readerview/build.gradle
@@ -27,7 +27,7 @@ tasks.register("updateBuiltInExtensionVersion", Copy) { task ->
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/search/build.gradle b/components/feature/search/build.gradle
@@ -33,8 +33,8 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
-        "-Xopt-in=kotlinx.coroutines.FlowPreview",
-        "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        "-opt-in=kotlinx.coroutines.FlowPreview",
+        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     ]
 }
 
diff --git a/components/feature/session/build.gradle b/components/feature/session/build.gradle
@@ -23,7 +23,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/sitepermissions/build.gradle b/components/feature/sitepermissions/build.gradle
@@ -47,7 +47,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/syncedtabs/build.gradle b/components/feature/syncedtabs/build.gradle
@@ -29,7 +29,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/feature/tabs/build.gradle b/components/feature/tabs/build.gradle
@@ -24,8 +24,8 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
-            "-Xopt-in=kotlinx.coroutines.FlowPreview",
-            "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+            "-opt-in=kotlinx.coroutines.FlowPreview",
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     ]
 }
 
diff --git a/components/feature/toolbar/build.gradle b/components/feature/toolbar/build.gradle
@@ -23,7 +23,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 
diff --git a/components/lib/state/build.gradle b/components/lib/state/build.gradle
@@ -33,7 +33,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
-        "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     ]
 }
 
diff --git a/components/support/ktx/build.gradle b/components/support/ktx/build.gradle
@@ -25,8 +25,8 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions.freeCompilerArgs += [
-        "-Xopt-in=kotlinx.coroutines.FlowPreview",
-        "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        "-opt-in=kotlinx.coroutines.FlowPreview",
+        "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     ]
 }
 
diff --git a/components/support/webextensions/build.gradle b/components/support/webextensions/build.gradle
@@ -28,7 +28,7 @@ android {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
+        freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,8 @@ subprojects {`
`258`	`258`	`kotlinOptions {`
`259`	`259`	`jvmTarget = "1.8"`
`260`	`260`	`freeCompilerArgs += [`
`261`		`- "-Xopt-in=kotlin.RequiresOptIn"`
	`261`	`+ "-opt-in=kotlin.RequiresOptIn"`
`262`	`262`	`]`
`263`		`- useIR = true`
`264`	`263`	`}`
`265`	`264`	`}`
`266`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ android {`
`27`	`27`
`28`	`28`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`29`	`29`	`kotlinOptions {`
`30`		`- freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
	`30`	`+ freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ android {`
`38`	`38`
`39`	`39`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`40`	`40`	`kotlinOptions {`
`41`		`- freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
	`41`	`+ freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ android {`
`28`	`28`
`29`	`29`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`30`	`30`	`kotlinOptions {`
`31`		`- freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
	`31`	`+ freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ android {`
`31`	`31`
`32`	`32`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`33`	`33`	`kotlinOptions {`
`34`		`- freeCompilerArgs += "-Xjvm-default=enable"`
	`34`	`+ freeCompilerArgs += "-Xjvm-default=all"`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ android {`
`29`	`29`
`30`	`30`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`31`	`31`	`kotlinOptions {`
`32`		`- freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
	`32`	`+ freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ tasks.register("updateBuiltInExtensionVersion", Copy) { task ->`
`27`	`27`
`28`	`28`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`29`	`29`	`kotlinOptions {`
`30`		`- freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
	`30`	`+ freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ android {`
`50`	`50`
`51`	`51`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`52`	`52`	`kotlinOptions {`
`53`		`- freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
	`53`	`+ freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ android {`
`23`	`23`
`24`	`24`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`25`	`25`	`kotlinOptions {`
`26`		`- freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
	`26`	`+ freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ android {`
`41`	`41`
`42`	`42`	`tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {`
`43`	`43`	`kotlinOptions {`
`44`		`- freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
	`44`	`+ freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi"`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`