Merge branch 'dev' into 388-do-not-require-internet-connection-for-worker-if-only-local-subscriptions-are-used

Author: ArnyminerZ

app/proguard-rules.pro

@@ -10,6 +10,10 @@
 # ical4j: keep all iCalendar properties/parameters (used via reflection)
 -keep class net.fortuna.ical4j.** { *; }
 
+# ical4j needs this
+-keep class org.apache.commons.validator.routines.** { *; }
+-dontwarn org.apache.commons.validator.routines.**
+
 # we are not using those optional features of ical4j
 -dontwarn org.jparsec.** # parser for filter expressions
 -dontwarn javax.cache.** # timezone caching

app/src/main/java/at/bitfire/icsdroid/ui/views/EnterUrlComposable.kt

@@ -312,8 +312,7 @@ private fun ColumnScope.ResourceInput(
             imeAction = ImeAction.Go
         ),
         keyboardActions = KeyboardActions { onSubmit() },
-        maxLines = 1,
-        singleLine = true,
+        maxLines = 8,
         placeholder = { Text(labelText) },
         isError = error != null,
         interactionSource = remember { MutableInteractionSource() }.also { interactionSource ->
@@ -346,7 +345,9 @@ fun EnterUrlComposable_Preview() {
         password = "previewUserPassword",
         onPasswordChange = {},
         isInsecure = true,
-        url = "http://previewUrl.com/calendarfile.ics",
+        url = "http://previewUrl.com/looong/looong/looong/looong/looong/looong/calendarfile.ics" +
+            "\n\n a\n b\n c\n\n" +
+            "http://previewUrl.com/looong/looong/looong/looong/looong/looong/calendarfile.ics",
         fileName = "file name",
         onUrlChange = {},
         urlError = "",

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-aboutLibs = "11.5.0"
-agp = "8.8.0"
+aboutLibs = "11.6.0"
+agp = "8.8.1"
 androidx-activityCompose = "1.10.0"
 androidx-appCompat = "1.7.0"
 androidx-archCore = "2.2.0"
@@ -13,17 +13,17 @@ androidx-work = "2.10.0"
 bitfire-cert4android = "f0964cb"
 bitfire-ical4android = "883954c"
 compose-dialogs = "1.3.0"
-compose-material = "1.7.7"
+compose-material = "1.7.8"
 compose-material3 = "1.3.1"
-compose-runtime = "1.7.7"
-compose-ui = "1.7.7"
+compose-runtime = "1.7.8"
+compose-ui = "1.7.8"
 datastore = "1.1.2"
 desugaring = "2.1.4"
 joda-time = "2.13.1"
 junit = "4.13.2"
 kotlin = "2.1.10"
 kotlinx-coroutines = "1.10.1"
-ksp = "2.1.10-1.0.29"
+ksp = "2.1.10-1.0.30"
 okhttp = "4.12.0"
 room = "2.6.1"