Merge branch 'GrapheneOS:main' into feature/added-release-states-display

Author: DirkBaumeister

.github/workflows/build.yml

@@ -7,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: 21

.github/workflows/validate-gradle-wrapper.yml

@@ -7,5 +7,5 @@ jobs:
     name: Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: gradle/actions/wrapper-validation@v4

app/build.gradle.kts

@@ -11,7 +11,7 @@ if (useKeystoreProperties) {
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose") version "2.2.0"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.2.10"
 }
 
 android {
@@ -95,15 +95,15 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.16.0")
+    implementation("androidx.core:core-ktx:1.17.0")
     implementation("androidx.activity:activity-compose:1.10.1")
     implementation("androidx.navigation:navigation-compose:2.9.3")
     implementation("androidx.datastore:datastore-preferences:1.1.7")
-    val lifecycleVersion = "2.9.2"
+    val lifecycleVersion = "2.9.3"
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion")
 
-    implementation(platform("androidx.compose:compose-bom:2025.07.00"))
+    implementation(platform("androidx.compose:compose-bom:2025.08.01"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-text")
     implementation("androidx.compose.ui:ui-graphics")

app/src/main/kotlin/app/grapheneos/info/InfoApp.kt

@@ -318,7 +318,12 @@ fun InfoApp() {
                             top = 0.dp,
                             end = innerPadding.calculateEndPadding(layoutDirection),
                             bottom = innerPadding.calculateBottomPadding()
-                        )
+                        ),
+                        showSnackbarError = {
+                            snackbarCoroutine.launch {
+                                snackbarHostState.showSnackbar(it)
+                            }
+                        }
                     )
                 }
                 composableWithDefaultSlideTransitions(

app/src/main/kotlin/app/grapheneos/info/ui/releases/ReleasesScreen.kt

@@ -35,6 +35,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun ReleasesScreen(
     modifier: Modifier = Modifier,
+    showSnackbarError: (String) -> Unit,
     entries: List<Pair<String, String>>,
     releaseStates: List<Pair<String, String>>,
     updateChangelog: (useCaches: Boolean, finishedUpdating: () -> Unit) -> Unit,
@@ -48,6 +49,9 @@ fun ReleasesScreen(
 
     val refreshCoroutineScope = rememberCoroutineScope()
 
+    val openUriIllegalArguementExceptionSnackbarError =
+        stringResource(R.string.browser_link_illegal_argument_exception_snackbar_error)
+
     DisposableEffect(lifecycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_START) {
@@ -130,7 +134,13 @@ fun ReleasesScreen(
                     modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp),
                     horizontalArrangement = Arrangement.Center,
                 ) {
-                    Button(onClick = { localUriHandler.openUri("https://grapheneos.org/releases") }) {
+                    Button(onClick = {
+                        try {
+                            localUriHandler.openUri("https://grapheneos.org/releases")
+                        } catch (_: IllegalArgumentException) {
+                            showSnackbarError(openUriIllegalArguementExceptionSnackbarError)
+                        }
+                    }) {
                         Text(text = stringResource(R.string.releases_see_all_button))
                     }
                 }

build.gradle.kts

@@ -1,4 +1,4 @@
 plugins {
-    id("com.android.application") version "8.12.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+    id("com.android.application") version "8.13.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.10" apply false
 }