From 82e8769407b4e6b0fb5b426add912aab6e7d33f5 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Sat, 28 Oct 2023 16:59:23 +0200
Subject: [PATCH] Bump dependencies and API targets.

---
 app-common/src/main/AndroidManifest.xml              |  2 ++
 app/build.gradle.kts                                 |  2 +-
 .../darken/capod/common/uix/PreferenceFragment2.kt   |  2 +-
 build.gradle.kts                                     |  2 +-
 buildSrc/build.gradle.kts                            |  2 +-
 buildSrc/src/main/java/Dependencies.kt               | 10 +++++-----
 buildSrc/src/main/java/ProjectConfig.kt              |  4 ++--
 buildSrc/src/main/java/Versions.kt                   | 12 ++++--------
 8 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app-common/src/main/AndroidManifest.xml b/app-common/src/main/AndroidManifest.xml
index beda55e9..58b9f334 100644
--- a/app-common/src/main/AndroidManifest.xml
+++ b/app-common/src/main/AndroidManifest.xml
@@ -23,6 +23,8 @@
         android:name="android.permission.BLUETOOTH_SCAN"
         android:usesPermissionFlags="neverForLocation" />
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
+
     <application>
         <receiver
             android:name=".bluetooth.BleScanResultReceiver"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 098d0e16..68de8c8e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -125,7 +125,7 @@ android {
 dependencies {
     implementation(project(":app-common"))
 
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
 
     addBaseKotlin()
 
diff --git a/app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt b/app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt
index 08254b4a..0ee8172f 100644
--- a/app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt
+++ b/app/src/main/java/eu/darken/capod/common/uix/PreferenceFragment2.kt
@@ -53,7 +53,7 @@ abstract class PreferenceFragment2
 
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
 
     }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index e00f3b41..91b4c9e5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.0.2")
+        classpath("com.android.tools.build:gradle:8.1.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Kotlin.core}")
         classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.Dagger.core}")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.AndroidX.Navigation.core}")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 409bda7a..2348cb02 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    implementation("com.android.tools.build:gradle:8.0.2")
+    implementation("com.android.tools.build:gradle:8.1.2")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0")
     implementation("com.squareup:javapoet:1.13.0")
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 41ee77c0..7e18ba4c 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -84,8 +84,8 @@ fun DependencyHandlerScope.addBaseWorkManager() {
 }
 
 fun DependencyHandlerScope.addBaseAndroid() {
-    implementation("androidx.core:core-ktx:1.10.0-rc01")
-    implementation("androidx.annotation:annotation:1.4.0")
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.annotation:annotation:1.7.0")
     implementation("androidx.collection:collection-ktx:1.2.0")
     implementation("androidx.preference:preference-ktx:1.2.0")
 }
@@ -95,12 +95,12 @@ fun DependencyHandlerScope.addBaseAndroidUi() {
     implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("androidx.fragment:fragment-ktx:1.4.1")
 
-    implementation("androidx.activity:activity-ktx:1.6.0-rc01")
-    implementation("androidx.fragment:fragment-ktx:1.5.0")
+    implementation("androidx.activity:activity-ktx:1.8.0")
+    implementation("androidx.fragment:fragment-ktx:1.6.1")
 
     implementation("com.google.android.material:material:1.5.0-rc01")
 
-    val lifecycleVers = "2.5.0"
+    val lifecycleVers = "2.6.2"
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVers")
     implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVers")
diff --git a/buildSrc/src/main/java/ProjectConfig.kt b/buildSrc/src/main/java/ProjectConfig.kt
index 8045b2e6..aa4512c1 100644
--- a/buildSrc/src/main/java/ProjectConfig.kt
+++ b/buildSrc/src/main/java/ProjectConfig.kt
@@ -14,8 +14,8 @@ object ProjectConfig {
     const val packageName = "eu.darken.capod"
 
     const val minSdk = 26
-    const val compileSdk = 33
-    const val targetSdk = 33
+    const val compileSdk = 34
+    const val targetSdk = 34
 
     object Version {
         val versionProperties = Properties().apply {
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
index a15b6729..e608adc2 100644
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@@ -1,11 +1,7 @@
 object Versions {
-    object Gradle {
-        const val buildTools = "7.1.2"
-    }
-
     object Kotlin {
-        const val core = "1.8.0"
-        const val coroutines = "1.6.2"
+        const val core = "1.9.10"
+        const val coroutines = "1.7.3"
     }
 
     object Dokka {
@@ -13,7 +9,7 @@ object Versions {
     }
 
     object Dagger {
-        const val core = "2.45"
+        const val core = "2.48.1"
     }
 
     object Moshi {
@@ -24,7 +20,7 @@ object Versions {
         const val core = ""
 
         object Navigation {
-            const val core = "2.5.0"
+            const val core = "2.7.3"
         }
 
         object Testing {