[ical4j 4.x] Update event handlers part1

gradle/libs.versions.toml

@@ -8,8 +8,7 @@ androidx-test-runner = "1.7.0"
 dokka = "2.1.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
+ical4j = "4.2.3"
 junit = "4.13.2"
 kotlin = "2.3.10"
 mockk = "1.14.9"

lib/build.gradle.kts

@@ -137,4 +137,12 @@ dependencies {
     testImplementation(libs.junit)
     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")
+    }
+}

lib/consumer-rules.pro

@@ -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.** { *; }

lib/src/androidTest/kotlin/at/bitfire/ical4android/AndroidTimeZonesTest.kt

@@ -9,11 +9,13 @@ package at.bitfire.ical4android
 import net.fortuna.ical4j.model.TimeZoneRegistryFactory
 import org.junit.Assert
 import org.junit.Assert.assertNotNull
+import org.junit.Ignore
 import org.junit.Test
 import java.time.ZoneId
 import java.time.format.TextStyle
 import java.util.Locale
 
+@Ignore("ical4j 4.x")
 class AndroidTimeZonesTest {
 
     @Test

lib/src/androidTest/kotlin/at/bitfire/ical4android/DmfsTaskTest.kt

@@ -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)

lib/src/androidTest/kotlin/at/bitfire/ical4android/JtxICalObjectTest.kt

@@ -837,7 +837,8 @@ class JtxICalObjectTest {
         //assertEquals(iCalIn.components[0].getProperty(Component.VTODO), iCalOut.components[0].getProperty(Component.VTODO))
 
         // there should only be one component for VJOURNAL and VTODO!
-        for(i in 0 until iCalIn.components.size)  {
+        TODO("ical4j 4.x")
+        /*for(i in 0 until iCalIn.components.size)  {
 
             iCalIn.components[i].properties.forEach { inProp ->
 
@@ -846,7 +847,7 @@ class JtxICalObjectTest {
                 val outProp = iCalOut.components[i].properties.getProperty<Property>(inProp.name)
                 assertEquals(inProp, outProp)
             }
-        }
+        }*/
     }