Merge branch 'main' into 315-run-instrumented-tests-on-different-api-levels

Author: rfc2822

gradle/libs.versions.toml

@@ -1,17 +1,16 @@
 [versions]
-agp = "9.1.0"
+agp = "9.2.0"
 android-desugar = "2.1.5"
 androidx-annotation = "1.10.0"
 androidx-core = "1.18.0"
 androidx-test-rules = "1.7.0"
 androidx-test-runner = "1.7.0"
 dokka = "2.2.0"
 ezvcard = "0.12.2"
-guava = "33.5.0-android"
-# noinspection NewerVersionAvailable
-ical4j = "3.2.19"   # final version; update to 4.x will require much work
+guava = "33.6.0-android"
+ical4j = "4.2.5"
 junit = "4.13.2"
-kotlin = "2.3.20"
+kotlin = "2.3.21"
 kotlinx-coroutines-test = "1.10.2"
 mockk = "1.14.9"
 roboelectric = "4.16.1"

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -34,12 +34,9 @@ android {
 
     buildFeatures.buildConfig = true
 
-    sourceSets["main"].apply {
-        kotlin {
-            directories += "${projectDir}/src/main/kotlin"
-        }
-        java {
-            directories += "${rootDir}/opentasks-contract/src/main/java"
+    sourceSets {
+        getByName("main") {
+            java.directories += "${rootDir}/opentasks-contract/src/main/java"
         }
     }
 
@@ -150,4 +147,12 @@ dependencies {
     testImplementation(libs.kotlin.coroutines.test)
     testImplementation(libs.mockk)
     testImplementation(libs.roboelectric)
-}
+}
+
+tasks.withType<Test>().configureEach {
+    options {
+        // Prevent Robolectric from instrumenting ical4j classes to avoid problems with registering
+        // ical4j's ZoneRulesProviderImpl more than once with Java's ZoneRulesProvider.
+        systemProperty("org.robolectric.packagesToNotAcquire", "net.fortuna.ical4j")
+    }
+}

gradlew

@@ -10,10 +10,6 @@
 -dontwarn org.codehaus.groovy.**
 -dontwarn org.jparsec.**
 
-# keep to be used by ical4j
--keep class at.bitfire.ical4android.AndroidCompatTimeZoneRegistry { *; }
--keep class at.bitfire.ical4android.AndroidCompatTimeZoneRegistry$Factory { *; }
-
 # keep all vCard properties/parameters (used via reflection)
 -keep class ezvcard.io.scribe.** { *; }
 -keep class ezvcard.property.** { *; }

gradlew.bat

@@ -6,6 +6,7 @@
 
 package at.bitfire.ical4android
 
+import android.os.Build
 import androidx.test.platform.app.InstrumentationRegistry
 import at.bitfire.synctools.test.GrantPermissionOrSkipRule
 import org.junit.After
@@ -25,7 +26,13 @@ abstract class DmfsStyleProvidersTaskTest(
     companion object {
         @Parameterized.Parameters(name="{0}")
         @JvmStatic
-        fun taskProviders() = listOf(TaskProvider.ProviderName.OpenTasks,TaskProvider.ProviderName.TasksOrg)
+        fun taskProviders() = buildList {
+            add(TaskProvider.ProviderName.OpenTasks)
+
+            // tasks.org requires Android 8
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                add(TaskProvider.ProviderName.TasksOrg)
+        }
     }
 
     @get:Rule

lib/build.gradle.kts

@@ -13,7 +13,6 @@ import androidx.core.content.contentValuesOf
 import at.bitfire.ical4android.impl.TestTaskList
 import at.bitfire.synctools.storage.LocalStorageException
 import at.bitfire.synctools.storage.tasks.DmfsTaskList
-import net.fortuna.ical4j.model.Date
 import net.fortuna.ical4j.model.TimeZoneRegistryFactory
 import net.fortuna.ical4j.model.component.VAlarm
 import net.fortuna.ical4j.model.parameter.RelType
@@ -31,6 +30,8 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Before
 import org.junit.Test
+import java.time.LocalDate
+import java.time.ZonedDateTime
 
 class DmfsTaskTest(
     providerName: TaskProvider.ProviderName
@@ -87,18 +88,27 @@ class DmfsTaskTest(
         task.summary = "Sample event"
         task.description = "Sample event with date/time"
         task.location = "Sample location"
-        task.dtStart = DtStart("20150501T120000", tzVienna)
-        task.due = Due("20150501T140000", tzVienna)
+        task.dtStart = DtStart(ZonedDateTime.of(
+            2015, 5, 1,
+            12, 0, 0, 0,
+            tzVienna.toZoneId()
+        ))
+        task.due = Due(ZonedDateTime.of(
+            2015, 5, 1,
+            14, 0, 0, 0,
+            tzVienna.toZoneId()
+        ))
         task.organizer = Organizer("mailto:organizer@example.com")
         assertFalse(task.isAllDay())
 
         // extended properties
         task.categories.addAll(arrayOf("Cat1", "Cat2"))
         task.comment = "A comment"
 
-        val sibling = RelatedTo("most-fields2@example.com")
-        sibling.parameters.add(RelType.SIBLING)
-        task.relatedTo.add(sibling)
+        task.relatedTo.add(
+            RelatedTo("most-fields2@example.com")
+                .add(RelType.SIBLING)
+        )
 
         task.unknownProperties += XProperty("X-UNKNOWN-PROP", "Unknown Value")
 
@@ -133,9 +143,9 @@ class DmfsTaskTest(
         val task = Task()
         task.uid = "invalidDUE@ical4android.tests"
         task.summary = "Task with invalid DUE"
-        task.dtStart = DtStart(Date("20150102"))
+        task.dtStart = DtStart(LocalDate.of(2015, 1, 2))
 
-        task.due = Due(Date("20150101"))
+        task.due = Due(LocalDate.of(2015, 1, 1))
         DmfsTask(taskList!!, task, "9468a4cf-0d5b-4379-a704-12f1f84100ba", null, 0).add()
     }
 
@@ -144,7 +154,7 @@ class DmfsTaskTest(
         val task = Task()
         task.uid = "TaskWithManyAlarms"
         task.summary = "Task with many alarms"
-        task.dtStart = DtStart(Date("20150102"))
+        task.dtStart = DtStart(LocalDate.of(2015, 1, 2))
 
         for (i in 1..1050)
             task.alarms += VAlarm(java.time.Duration.ofMinutes(i.toLong()))
@@ -162,7 +172,11 @@ class DmfsTaskTest(
         task.summary = "Sample event"
         task.description = "Sample event with date/time"
         task.location = "Sample location"
-        task.dtStart = DtStart("20150501T120000", tzVienna)
+        task.dtStart = DtStart(ZonedDateTime.of(
+            2015, 5, 1,
+            12, 0, 0, 0,
+            tzVienna.toZoneId()
+        ))
         assertFalse(task.isAllDay())
         val uri = DmfsTask(taskList!!, task, "9468a4cf-0d5b-4379-a704-12f1f84100ba", null, 0).add()
         assertNotNull(uri)