Upgrade dependencies (#1537)

* app: use MaterialAlertDialogBuilder for preference dialogs

* build: upgrade all dependencies

3 files changed, 9 insertions, 6 deletions

diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt
index 91dd4908..26f060ad 100644
--- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt
@@ -8,6 +8,8 @@ package dev.msfjarvis.aps.ui.settings
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import de.Maxr1998.modernpreferences.Preference
 import de.Maxr1998.modernpreferences.PreferencesAdapter
 import de.Maxr1998.modernpreferences.helpers.screen
 import de.Maxr1998.modernpreferences.helpers.subScreen
@@ -30,6 +32,7 @@ class SettingsActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(binding.root)
+    Preference.Config.dialogBuilderFactory = { context -> MaterialAlertDialogBuilder(context) }
     val screen =
       screen(this) {
         subScreen {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index fe72e9e0..48b0ff0e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -33,7 +33,7 @@ gradlePlugin {
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:7.0.2")
+  implementation("com.android.tools.build:gradle:7.0.3")
   implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
   implementation("com.google.dagger:hilt-android-gradle-plugin:2.39.1")
   implementation("com.squareup.okhttp3:okhttp:4.9.0")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a5bc234..525b4a1d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 [versions]
 androidx_activity = "1.4.0"
 androidx_test = "1.4.1-alpha03"
-compose = "1.1.0-beta01"
+compose = "1.1.0-beta02"
 composeSnapshot = "-"
 coroutines = "1.5.2"
 flowbinding = "1.2.0"
@@ -18,21 +18,21 @@ kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-co
 # AndroidX dependencies
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx_activity" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx_activity" }
-androidx-annotation = "androidx.annotation:annotation:1.2.0"
+androidx-annotation = "androidx.annotation:annotation:1.3.0"
 androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01"
 androidx-appcompat = "androidx.appcompat:appcompat:1.4.0-rc01"
 androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.1"
 androidx-core-ktx = "androidx.core:core-ktx:1.7.0"
 androidx-documentfile = "androidx.documentfile:documentfile:1.1.0-alpha01"
-androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-beta01"
+androidx-fragment-ktx = "androidx.fragment:fragment-ktx:1.4.0-rc01"
 androidx-hilt-compose = "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref="lifecycle" }
 androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref="lifecycle" }
 androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref="lifecycle" }
 androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"
 androidx-material = "com.google.android.material:material:1.5.0-alpha05"
-androidx-preference = "androidx.preference:preference:1.2.0-alpha01"
+androidx-preference = "androidx.preference:preference:1.2.0-alpha02"
 androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0-alpha01"
 androidx-recyclerviewSelection = "androidx.recyclerview:recyclerview-selection:1.2.0-alpha01"
 androidx-security = "androidx.security:security-crypto:1.1.0-alpha03"
@@ -75,7 +75,7 @@ thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r"
 thirdparty-kotlinResult = "com.michael-bull.kotlin-result:kotlin-result:1.1.13"
 thirdparty-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.7"
 thirdparty-logcat = "com.squareup.logcat:logcat:0.1"
-thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.1.0"
+thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.2.0"
 thirdparty-pgpainless = "org.pgpainless:pgpainless-core:1.0.0-rc1"
 thirdparty-plumber = "com.squareup.leakcanary:plumber-android:2.7"
 thirdparty-sshj = "com.hierynomus:sshj:0.32.0"