diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1da4676..9e2e3b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,10 +14,10 @@ jobs:
submodules: true
- name: Validate gradle wrapper checksum
- uses: gradle/actions/wrapper-validation@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0
+ uses: gradle/actions/wrapper-validation@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
- name: Set up JDK 21
- uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1
+ uses: actions/setup-java@77dd5b2ce225ea11469928ac317850245a74ae78 # v6.2.0
with:
distribution: 'temurin'
java-version: 21
@@ -38,7 +38,7 @@ jobs:
rustup target add x86_64-linux-android
- name: Cache Rust dependencies
- uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
+ uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3
- name: Build and test
# Debug build only since release builds require a signing key
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b2b2983..8ff1950 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Create release
- uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
+ uses: softprops/action-gh-release@8a0cd651e5b2365bd640854a3fa5dfc70e4875f3 # v3.0.4
with:
tag_name: v${{ steps.get_version.outputs.version }}
name: Version ${{ steps.get_version.outputs.version }}
diff --git a/Cargo.lock b/Cargo.lock
index 60ff498..aa96017 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,7 +73,7 @@ dependencies = [
"io-lifetimes 3.0.1",
"ipnet",
"maybe-owned",
- "rustix 1.1.5",
+ "rustix 1.1.6",
"rustix-linux-procfs",
"windows-sys 0.61.2",
"winx",
@@ -88,14 +88,14 @@ dependencies = [
"cap-primitives",
"io-extras",
"io-lifetimes 3.0.1",
- "rustix 1.1.5",
+ "rustix 1.1.6",
]
[[package]]
name = "cc"
-version = "1.4.7"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54413ede23c2daf518f35156dfde027feb2374004d63bd497f983c8db9c0e313"
+checksum = "4ff2a8126fff0f8c839080d619675a585e61720bb12d2baceae45769fd66f155"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -131,9 +131,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.18.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
+checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
[[package]]
name = "errno"
@@ -147,9 +147,9 @@ dependencies = [
[[package]]
name = "find-msvc-tools"
-version = "0.1.13"
+version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef25905e51abafe4dcea6c15fec58c57b601cdbd0ee53d22ea1d3016c587d39b"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
[[package]]
name = "fs-set-times"
@@ -158,7 +158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a"
dependencies = [
"io-lifetimes 2.0.4",
- "rustix 1.1.5",
+ "rustix 1.1.6",
"windows-sys 0.59.0",
]
@@ -228,15 +228,15 @@ dependencies = [
[[package]]
name = "lazy_static"
-version = "1.5.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
[[package]]
name = "libc"
-version = "0.2.189"
+version = "0.2.191"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
[[package]]
name = "libloading"
@@ -262,9 +262,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
[[package]]
name = "log"
-version = "0.4.34"
+version = "0.4.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
+checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c"
[[package]]
name = "maybe-owned"
@@ -292,7 +292,7 @@ dependencies = [
"byteorder",
"cap-std",
"libc",
- "rustix 1.1.5",
+ "rustix 1.1.6",
"sepatch",
"system-properties",
"tracing",
@@ -425,9 +425,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d"
+checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa"
dependencies = [
"bitflags",
"errno",
@@ -443,7 +443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fc84bf7e9aa16c4f2c758f27412dc9841341e16aa682d9c7ac308fe3ee12056"
dependencies = [
"once_cell",
- "rustix 1.1.5",
+ "rustix 1.1.6",
]
[[package]]
@@ -480,9 +480,9 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
[[package]]
name = "smallvec"
-version = "1.16.1"
+version = "1.16.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891"
+checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46"
[[package]]
name = "syn"
@@ -497,9 +497,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "3.0.6"
+version = "3.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
dependencies = [
"proc-macro2",
"quote",
@@ -531,28 +531,28 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "230a1b821ccbd75b185820a1f1ff7b14d21da1e442e22c0863ea5f08771a8874"
dependencies = [
- "rustix 1.1.5",
+ "rustix 1.1.6",
"windows-sys 0.61.2",
]
[[package]]
name = "thiserror"
-version = "2.0.20"
+version = "2.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f"
+checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "2.0.20"
+version = "2.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
+checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
dependencies = [
"proc-macro2",
"quote",
- "syn 3.0.6",
+ "syn 3.0.9",
]
[[package]]
@@ -634,9 +634,9 @@ dependencies = [
[[package]]
name = "unicode-ident"
-version = "1.0.26"
+version = "1.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
[[package]]
name = "valuable"
@@ -808,9 +808,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
[[package]]
name = "winnow"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
+checksum = "8c3b93199df0ab874cdf0c6a94f0a0dc3423fe41f1cafb62b8bd7b1deb277aef"
dependencies = [
"memchr",
]
diff --git a/app/src/main/java/com/chiller3/msd/settings/DeviceDialog.kt b/app/src/main/java/com/chiller3/msd/settings/DeviceDialog.kt
index 066fd24..be4b99f 100644
--- a/app/src/main/java/com/chiller3/msd/settings/DeviceDialog.kt
+++ b/app/src/main/java/com/chiller3/msd/settings/DeviceDialog.kt
@@ -3,15 +3,12 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
-@file:OptIn(ExperimentalUnsignedTypes::class)
-
package com.chiller3.msd.settings
import android.net.Uri
import android.os.Parcelable
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
@@ -49,7 +46,6 @@ sealed interface DeviceAction : Parcelable {
data class Remove(val uri: Uri) : DeviceAction
}
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun DeviceDialog(
type: DeviceDialogType,
diff --git a/app/src/main/java/com/chiller3/msd/settings/ErrorDetailsDialog.kt b/app/src/main/java/com/chiller3/msd/settings/ErrorDetailsDialog.kt
index 7dbd706..381b310 100644
--- a/app/src/main/java/com/chiller3/msd/settings/ErrorDetailsDialog.kt
+++ b/app/src/main/java/com/chiller3/msd/settings/ErrorDetailsDialog.kt
@@ -3,15 +3,12 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
-@file:OptIn(ExperimentalUnsignedTypes::class)
-
package com.chiller3.msd.settings
import android.content.ClipData
import android.content.ClipboardManager
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
@@ -20,7 +17,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.window.DialogProperties
import com.chiller3.msd.R
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun ErrorDetailsDialog(
message: String?,
diff --git a/app/src/main/java/com/chiller3/msd/settings/SettingsScreen.kt b/app/src/main/java/com/chiller3/msd/settings/SettingsScreen.kt
index b645459..2247ce9 100644
--- a/app/src/main/java/com/chiller3/msd/settings/SettingsScreen.kt
+++ b/app/src/main/java/com/chiller3/msd/settings/SettingsScreen.kt
@@ -16,7 +16,6 @@ import android.provider.DocumentsContract
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.SnackbarResult
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
@@ -219,7 +218,6 @@ fun SettingsScreen(viewModel: SettingsViewModel = viewModel()) {
}
}
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
private fun SettingsContent(
canAct: Boolean,
diff --git a/app/src/main/java/com/chiller3/msd/settings/SettingsViewModel.kt b/app/src/main/java/com/chiller3/msd/settings/SettingsViewModel.kt
index 0cbcdb6..9947f27 100644
--- a/app/src/main/java/com/chiller3/msd/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/chiller3/msd/settings/SettingsViewModel.kt
@@ -23,7 +23,6 @@ import com.chiller3.msd.daemon.ClientException
import com.chiller3.msd.extension.toSingleLineString
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/chiller3/msd/standalone/ClearPackageManagerCaches.kt b/app/src/main/java/com/chiller3/msd/standalone/ClearPackageManagerCaches.kt
index 3a679ba..5c80ad5 100644
--- a/app/src/main/java/com/chiller3/msd/standalone/ClearPackageManagerCaches.kt
+++ b/app/src/main/java/com/chiller3/msd/standalone/ClearPackageManagerCaches.kt
@@ -13,7 +13,6 @@ import com.chiller3.msd.BuildConfig
import java.lang.invoke.MethodHandles
import java.nio.file.Path
import java.nio.file.Paths
-import kotlin.io.path.ExperimentalPathApi
import kotlin.io.path.deleteIfExists
import kotlin.io.path.isRegularFile
import kotlin.io.path.readBytes
@@ -54,7 +53,6 @@ private fun ByteArray.indexOfSubarray(needle: ByteArray, start: Int = 0): Int {
return -1
}
-@OptIn(ExperimentalPathApi::class)
private fun clearPackageManagerCache(appId: String): Boolean {
// The current implementation of the package cache uses PackageImpl.writeToParcel(), which
// serializes the cache entry to the file as a Parcel. The current Parcel implementation stores
diff --git a/app/src/main/java/com/chiller3/msd/ui/Preferences.kt b/app/src/main/java/com/chiller3/msd/ui/Preferences.kt
index 111ab37..20fe29d 100644
--- a/app/src/main/java/com/chiller3/msd/ui/Preferences.kt
+++ b/app/src/main/java/com/chiller3/msd/ui/Preferences.kt
@@ -24,7 +24,6 @@ import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberOverscrollEffect
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.ListItemColors
import androidx.compose.material3.ListItemDefaults
@@ -52,7 +51,6 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.chiller3.msd.ui.theme.Icons
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
object PreferenceDefaults {
val HorizontalPadding = 16.dp
val SegmentedGap = ListItemDefaults.SegmentedGap
@@ -156,7 +154,6 @@ fun PreferenceCategory(
}
}
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun Preference(
onClick: () -> Unit,
@@ -208,7 +205,6 @@ private fun PreferenceSwitch(
)
}
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun SplitSwitchPreference(
onClick: () -> Unit,
diff --git a/app/src/main/java/com/chiller3/msd/ui/SegmentedList.kt b/app/src/main/java/com/chiller3/msd/ui/SegmentedList.kt
index a6604a2..1e1fe75 100644
--- a/app/src/main/java/com/chiller3/msd/ui/SegmentedList.kt
+++ b/app/src/main/java/com/chiller3/msd/ui/SegmentedList.kt
@@ -6,13 +6,11 @@
package com.chiller3.msd.ui
import androidx.compose.foundation.shape.CornerBasedShape
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.ListItemDefaults.shapes
import androidx.compose.material3.ListItemShapes
import androidx.compose.runtime.Composable
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun betterSegmentedShapes(
index: Int,
@@ -39,7 +37,6 @@ fun betterSegmentedShapes(
return ListItemDefaults.segmentedShapes(index, count, defaultShapes)
}
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
object BetterSegmentedShapes {
@Composable
fun top() = betterSegmentedShapes(0, 3)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index da08b72..8cd4654 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
[versions]
-android-gradle-plugin = "9.4.1"
+android-gradle-plugin = "9.5.1"
androidx-activity = "1.13.0"
androidx-compose-bom = "2026.09.00"
-androidx-compose-material3 = "1.5.0-alpha28"
-androidx-core = "1.19.0"
+androidx-compose-material3 = "1.5.0-rc01"
+androidx-core = "1.19.1"
androidx-lifecycle-viewmodel-compose = "2.11.0"
androidx-preference = "1.2.1"
-jgit = "7.8.0.202609011348-r"
+jgit = "7.8.1.202611041320-r"
json = "20260814"
-kotlin = "2.4.20"
+kotlin = "2.4.21"
material = "1.14.0"
[libraries]
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index d584b8d..287c4c9 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -174,22 +174,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -197,35 +187,25 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
@@ -233,22 +213,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -264,30 +234,30 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
@@ -295,11 +265,6 @@
-
-
-
-
-
@@ -309,13 +274,8 @@
-
-
-
-
-
-
+
@@ -323,22 +283,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -346,22 +296,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -369,11 +309,6 @@
-
-
-
-
-
@@ -383,13 +318,8 @@
-
-
-
-
-
-
+
@@ -402,22 +332,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -425,22 +345,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -448,22 +358,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -471,22 +371,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -494,22 +384,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -517,22 +397,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -540,22 +410,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -563,22 +423,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -586,22 +436,12 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -641,20 +481,20 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -689,20 +529,20 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -815,6 +655,11 @@
+
+
+
+
+
@@ -825,11 +670,6 @@
-
-
-
-
-
@@ -898,6 +738,11 @@
+
+
+
+
+
@@ -908,11 +753,6 @@
-
-
-
-
-
@@ -1045,11 +885,6 @@
-
-
-
-
-
@@ -1058,24 +893,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1084,14 +906,6 @@
-
-
-
-
-
-
-
-
@@ -1304,223 +1118,223 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -1531,44 +1345,44 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -1587,108 +1401,108 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -2279,6 +2093,14 @@
+
+
+
+
+
+
+
+
@@ -2326,25 +2148,25 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
@@ -2392,28 +2214,28 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -2421,12 +2243,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -2437,20 +2259,20 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -2461,12 +2283,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -2477,12 +2299,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -2493,12 +2315,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -2509,20 +2331,20 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -2533,12 +2355,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -2549,92 +2371,92 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -2653,12 +2475,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -2669,12 +2491,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -2701,12 +2523,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -2725,51 +2547,46 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -2785,11 +2602,6 @@
-
-
-
-
-
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index eddabd2..51cbd2a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 760c459..0bb71f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionSha256Sum=0b00b0ffe07c4d4789c12d4935a44a7057d55774b7540bd4a3f76f336deb177a
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
diff --git a/gradlew.bat b/gradlew.bat
index 8508ef6..03754c4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,33 @@
@rem Set local scope for the variables, and ensure extensions are enabled
setlocal EnableExtensions
+@rem Catch executions from older scripts and ensure they exit cleanly.
+@rem This can be removed once we can be reasonably confident that few people
+@rem will be migrating directly to this new wrapper.
+goto afterSafetyNet
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+goto exitWithErrorLevel
+:afterSafetyNet
+
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
@@ -45,13 +72,14 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
"%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
@@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+1>&2 echo.
+1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+1>&2 echo.
+1>&2 echo Please set the JAVA_HOME variable in your environment to match the
+1>&2 echo location of your Java installation.
"%COMSPEC%" /c exit 1
+goto exitWithErrorLevel
:execute
@rem Setup the command line
@@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2
@rem Execute gradlew
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel
+@rem This label must not be changed. We rely on old scripts being able to jump to this point.
:exitWithErrorLevel
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
"%COMSPEC%" /c exit %ERRORLEVEL%