diff --git a/app/build.gradle b/app/build.gradle
index 7ae95168e..ac3415888 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -449,7 +449,7 @@ configurations {
 
 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/build.gradle b/build.gradle
index a3022875e..f7e4d142b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -144,7 +144,7 @@ allprojects {
         kotlinOptions.jvmTarget = "1.8"
         kotlinOptions.allWarningsAsErrors = true
         kotlinOptions.freeCompilerArgs += [
-            "-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=enable"
+            "-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"
         ]
     }
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 5f5cc43aa..be5f4afb7 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -6,7 +6,7 @@
 // FORCE REBUILD 2022-09-16
 
 object Versions {
-    const val kotlin = "1.6.10"
+    const val kotlin = "1.7.10"
     const val coroutines = "1.6.1"
 
     // These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
@@ -21,7 +21,7 @@ object Versions {
     const val jna = "5.8.0"
 
     const val androidx_compose = "1.2.1"
-    const val androidx_compose_compiler = "1.1.1"
+    const val androidx_compose_compiler = "1.3.0"
     const val androidx_appcompat = "1.3.0"
     const val androidx_benchmark = "1.0.0"
     const val androidx_biometric = "1.1.0"