From 912e02f3f538376dbb37613d556322a943649f2c Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 9 Mar 2023 18:31:26 -0500
Subject: [PATCH] Update dependencies more

---
 gradle.properties       |  2 --
 mobile/build.gradle.kts | 12 +++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c22f56c0..fc6ef1a8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,14 +9,12 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-android.databinding.incremental=true
 android.enableJetifier=true
 android.enableR8.fullMode=true
 android.enableResourceOptimizations=false
 android.injected.testOnly=false
 android.nonTransitiveRClass=true
 android.useAndroidX=true
-kapt.incremental.apt=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 04c0e9a8..64700a6b 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -19,6 +19,9 @@ android {
         targetCompatibility(javaVersion)
     }
     kotlinOptions.jvmTarget = javaVersion.toString()
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+        kotlinOptions.jvmTarget = javaVersion.toString()
+    }
     compileSdkPreview = "UpsideDownCake"
     defaultConfig {
         applicationId = "be.mygod.vpnhotspot"
@@ -50,7 +53,10 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
     }
-    packagingOptions.resources.excludes.add("**/*.kotlin_*")
+    packagingOptions.resources.excludes.addAll(listOf(
+        "**/*.kotlin_*",
+        "META-INF/versions/**",
+    ))
     flavorDimensions.add("freedom")
     productFlavors {
         create("freedom") {
@@ -66,7 +72,7 @@ android {
 }
 
 dependencies {
-    val lifecycleVersion = "2.6.0-rc01"
+    val lifecycleVersion = "2.6.0"
     val roomVersion = "2.5.0"
 
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.2")
@@ -93,7 +99,7 @@ dependencies {
     implementation("com.linkedin.dexmaker:dexmaker:2.28.3")
     implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.0-Beta")
     add("googleImplementation", "com.google.android.play:core:1.10.3")
     add("googleImplementation", "com.google.android.play:core-ktx:1.8.1")
     testImplementation("junit:junit:4.13.2")