Update ical4j to 4.x and make everything compile again

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/src/androidTest/kotlin/at/bitfire/ical4android/AndroidCompatTimeZoneRegistryTest.kt

@@ -48,14 +48,15 @@ class AndroidCompatTimeZoneRegistryTest {
 
     @Test
     fun getTimeZone_Existing_ButNotInIcal4j() {
-        val reg = AndroidCompatTimeZoneRegistry(object: TimeZoneRegistry {
+        TODO("ical4j 4.x")
+        /*val reg = AndroidCompatTimeZoneRegistry(object: TimeZoneRegistry {
             override fun register(timezone: TimeZone?) = throw NotImplementedError()
             override fun register(timezone: TimeZone?, update: Boolean) = throw NotImplementedError()
             override fun clear() = throw NotImplementedError()
             override fun getTimeZone(id: String?) = null
 
         })
-        assertNull(reg.getTimeZone("Europe/Berlin"))
+        assertNull(reg.getTimeZone("Europe/Berlin"))*/
     }
 
     @Test

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

@@ -82,7 +82,8 @@ class DmfsTaskTest(
     @Test
     fun testAddTask() {
         // build and write event to calendar provider
-        val task = Task()
+        TODO("ical4j 4.x")
+        /*val task = Task()
         task.uid = "sample1@testAddEvent"
         task.summary = "Sample event"
         task.description = "Sample event with date/time"
@@ -125,26 +126,28 @@ class DmfsTaskTest(
             assertEquals(task.unknownProperties, task2.unknownProperties)
         } finally {
             testTask.delete()
-        }
+        }*/
     }
 
     @Test(expected = LocalStorageException::class)
     fun testAddTaskWithInvalidDue() {
         val task = Task()
-        task.uid = "invalidDUE@ical4android.tests"
+        TODO("ical4j 4.x")
+        /*task.uid = "invalidDUE@ical4android.tests"
         task.summary = "Task with invalid DUE"
         task.dtStart = DtStart(Date("20150102"))
 
         task.due = Due(Date("20150101"))
-        DmfsTask(taskList!!, task, "9468a4cf-0d5b-4379-a704-12f1f84100ba", null, 0).add()
+        DmfsTask(taskList!!, task, "9468a4cf-0d5b-4379-a704-12f1f84100ba", null, 0).add()*/
     }
 
     @Test
     fun testAddTaskWithManyAlarms() {
         val task = Task()
         task.uid = "TaskWithManyAlarms"
         task.summary = "Task with many alarms"
-        task.dtStart = DtStart(Date("20150102"))
+        TODO("ical4j 4.x")
+        //task.dtStart = DtStart(Date("20150102"))
 
         for (i in 1..1050)
             task.alarms += VAlarm(java.time.Duration.ofMinutes(i.toLong()))
@@ -162,7 +165,8 @@ class DmfsTaskTest(
         task.summary = "Sample event"
         task.description = "Sample event with date/time"
         task.location = "Sample location"
-        task.dtStart = DtStart("20150501T120000", tzVienna)
+        TODO("ical4j 4.x")
+        //task.dtStart = DtStart("20150501T120000", tzVienna)
         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)
             }
-        }
+        }*/
     }
 
 

lib/src/androidTest/kotlin/at/bitfire/synctools/mapping/tasks/DmfsTaskBuilderTest.kt

@@ -82,7 +82,11 @@ class DmfsTaskBuilderTest (
 
     // builder tests
 
-    @Test
+    init {
+        TODO("ical4j 4.x")
+    }
+
+    /*@Test
     fun testBuildTask_Sequence() {
         buildTask {
             ICalendar.apply { sequence = 12345 }
@@ -263,7 +267,7 @@ class DmfsTaskBuilderTest (
         buildTask {
         }.let { result ->
             assertEquals(
-                TaskContract.Tasks.CLASSIFICATION_DEFAULT /* null */,
+                TaskContract.Tasks.CLASSIFICATION_DEFAULT *//* null *//*,
                 result.getAsInteger(TaskContract.Tasks.CLASSIFICATION)
             )
         }
@@ -771,7 +775,7 @@ class DmfsTaskBuilderTest (
         val dmfsTask = DmfsTask(taskList!!, task, "9dc64544-1816-4f04-b952-e894164467f6", null, 0)
         dmfsTask.task!!.dtStart = DtStart("20150101", tzVienna)
         assertEquals(tzVienna, builder.getTimeZone())
-    }
+    }*/
 
 
     // helpers

lib/src/main/kotlin/at/bitfire/ical4android/AndroidCompatTimeZoneRegistry.kt

@@ -6,17 +6,13 @@
 
 package at.bitfire.ical4android
 
-import java.time.ZoneId
-import java.util.logging.Logger
 import net.fortuna.ical4j.model.DefaultTimeZoneRegistryFactory
-import net.fortuna.ical4j.model.Property
-import net.fortuna.ical4j.model.PropertyList
 import net.fortuna.ical4j.model.TimeZone
 import net.fortuna.ical4j.model.TimeZoneRegistry
 import net.fortuna.ical4j.model.TimeZoneRegistryFactory
 import net.fortuna.ical4j.model.TimeZoneRegistryImpl
-import net.fortuna.ical4j.model.component.VTimeZone
-import net.fortuna.ical4j.model.property.TzId
+import java.time.ZoneId
+import java.util.logging.Logger
 
 /**
  * Wrapper around default [TimeZoneRegistry] that uses the Android name if a time zone has a
@@ -78,12 +74,13 @@ class AndroidCompatTimeZoneRegistry(
 
             // create a copy of the VTIMEZONE so that we don't modify the original registry values (which are not immutable)
             val vTimeZone = tz.vTimeZone
-            val newVTimeZoneProperties = PropertyList<Property>()
+            TODO("ical4j 4.x")
+            /*val newVTimeZoneProperties = PropertyList<Property>()
             newVTimeZoneProperties += TzId(androidTzId)
             return TimeZone(VTimeZone(
                 newVTimeZoneProperties,
                 vTimeZone.observances
-            ))
+            ))*/
         } else
             return tz
     }

lib/src/main/kotlin/at/bitfire/ical4android/ICalendar.kt

@@ -11,31 +11,17 @@ import at.bitfire.synctools.BuildConfig
 import at.bitfire.synctools.exception.InvalidICalendarException
 import at.bitfire.synctools.icalendar.ICalendarParser
 import at.bitfire.synctools.icalendar.validation.ICalPreprocessor
-import net.fortuna.ical4j.data.CalendarBuilder
-import net.fortuna.ical4j.data.ParserException
 import net.fortuna.ical4j.model.Calendar
-import net.fortuna.ical4j.model.ComponentList
 import net.fortuna.ical4j.model.Date
-import net.fortuna.ical4j.model.Parameter
-import net.fortuna.ical4j.model.Property
-import net.fortuna.ical4j.model.PropertyList
-import net.fortuna.ical4j.model.component.Daylight
 import net.fortuna.ical4j.model.component.Observance
-import net.fortuna.ical4j.model.component.Standard
 import net.fortuna.ical4j.model.component.VAlarm
 import net.fortuna.ical4j.model.component.VTimeZone
 import net.fortuna.ical4j.model.parameter.Related
-import net.fortuna.ical4j.model.property.Color
 import net.fortuna.ical4j.model.property.DateProperty
 import net.fortuna.ical4j.model.property.DtStart
 import net.fortuna.ical4j.model.property.ProdId
-import net.fortuna.ical4j.model.property.RDate
-import net.fortuna.ical4j.model.property.RRule
 import net.fortuna.ical4j.validate.ValidationException
 import java.io.Reader
-import java.io.StringReader
-import java.time.Duration
-import java.time.Period
 import java.util.LinkedList
 import java.util.UUID
 import java.util.logging.Level
@@ -102,7 +88,8 @@ open class ICalendar {
 
             // fill calendar properties
             properties?.let {
-                calendar.getProperty<Property>(CALENDAR_NAME)?.let { calName ->
+                TODO("ical4j 4.x")
+                /*calendar.getProperty<Property>(CALENDAR_NAME)?.let { calName ->
                     properties[CALENDAR_NAME] = calName.value
                 }
 
@@ -111,7 +98,7 @@ open class ICalendar {
                 }
                 calendar.getProperty<Property>(CALENDAR_COLOR)?.let { calColor ->
                     properties[CALENDAR_COLOR] = calColor.value
-                }
+                }*/
             }
 
             return calendar
@@ -137,6 +124,10 @@ open class ICalendar {
             var newTz: VTimeZone? = null
             val keep = mutableSetOf<Observance>()
 
+            TODO("ical4j 4.x")
+            // Note: big method – maybe split?
+
+            /*
             if (start != null) {
                 // find latest matching STANDARD/DAYLIGHT observances
                 var latestDaylight: Pair<Date, Observance>? = null
@@ -210,7 +201,7 @@ open class ICalendar {
                     logger.log(Level.WARNING, "Minified timezone is invalid, using original one", e)
                     newTz = null
                 }
-            }
+            }*/
 
             // use original time zone if we couldn't calculate a minified one
             return newTz ?: originalTz
@@ -222,14 +213,15 @@ open class ICalendar {
          * @return time zone id (TZID) if VTIMEZONE contains a TZID, null otherwise
          */
         fun timezoneDefToTzId(timezoneDef: String): String? {
-            try {
+            TODO("ical4j 4.x")
+            /*try {
                 val builder = CalendarBuilder()
                 val cal = builder.build(StringReader(timezoneDef))
                 val timezone = cal.getComponent(VTimeZone.VTIMEZONE) as VTimeZone?
                 timezone?.timeZoneId?.let { return it.value }
             } catch (e: ParserException) {
                 logger.log(Level.SEVERE, "Can't understand time zone definition", e)
-            }
+            }*/
             return null
         }
 
@@ -279,14 +271,17 @@ open class ICalendar {
          */
         fun vAlarmToMin(
             alarm: VAlarm,
-            refStart: DtStart?,
-            refEnd: DateProperty?,
+            refStart: DtStart<*>?,
+            refEnd: DateProperty<*>?,
             refDuration: net.fortuna.ical4j.model.property.Duration?,
             allowRelEnd: Boolean
         ): Pair<Related, Int>? {
             val trigger = alarm.trigger ?: return null
 
-            val minutes: Int    // minutes before/after the event
+            TODO("ical4j 4.x")
+            // Note: big method – maybe split?
+
+            /*val minutes: Int    // minutes before/after the event
             var related = trigger.getParameter(Parameter.RELATED) ?: Related.START
 
             // event/task start time
@@ -345,7 +340,7 @@ open class ICalendar {
                 return null
             }
 
-            return Pair(related, minutes)
+            return Pair(related, minutes)*/
         }
 
     }

lib/src/main/kotlin/at/bitfire/ical4android/JtxCollection.kt

@@ -17,10 +17,7 @@ import at.bitfire.synctools.storage.toContentValues
 import at.techbee.jtx.JtxContract
 import at.techbee.jtx.JtxContract.asSyncAdapter
 import net.fortuna.ical4j.model.Calendar
-import net.fortuna.ical4j.model.component.VJournal
-import net.fortuna.ical4j.model.component.VToDo
 import net.fortuna.ical4j.model.property.ProdId
-import net.fortuna.ical4j.model.property.Version
 import java.util.LinkedList
 import java.util.logging.Level
 import java.util.logging.Logger
@@ -259,7 +256,8 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account,
             logger.fine("getICSForCollection: found ${cursor?.count} records in ${account.name}")
 
             val ical = Calendar()
-            ical.properties += Version.VERSION_2_0
+            TODO("ical4j 4.x")
+            /*ical.properties += Version.VERSION_2_0
             ical.properties += prodId
 
             while (cursor?.moveToNext() == true) {
@@ -270,7 +268,7 @@ open class JtxCollection<out T: JtxICalObject>(val account: Account,
                     if(component is VToDo || component is VJournal)
                         ical.components += component
                 }
-            }
+            }*/
             return ical.toString()
         }
     }