From 80abbbcce5161a0e4d5eba81619b07fea7950186 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sat, 19 Nov 2022 23:53:19 -0600 Subject: [PATCH] Update ical4android --- app/build.gradle.kts | 7 +++- .../main/java/org/tasks/caldav/iCalendar.kt | 2 +- .../main/java/org/tasks/data/MyAndroidTask.kt | 2 +- deps_fdroid.txt | 39 ++++++++++++------- deps_googleplay.txt | 39 ++++++++++++------- 5 files changed, 59 insertions(+), 30 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 408b3b950..587bf9b2b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -161,8 +161,11 @@ val googleplayImplementation by configurations dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") implementation("com.github.tasks:dav4jvm:deb2c9aef8") - implementation("com.github.tasks:ical4android:0e928b567c") { - exclude(group = "com.sun.mail", module = "javax.mail") + implementation("com.github.tasks:ical4android:2fb465b") { + exclude(group = "commons-logging") + exclude(group = "org.json", module = "json") + exclude(group = "org.codehaus.groovy", module = "groovy") + exclude(group = "org.codehaus.groovy", module = "groovy-dateutil") } implementation("com.github.bitfireAT:cert4android:7814052") implementation("com.github.tasks.opentasks:opentasks-provider:562fec5") { diff --git a/app/src/main/java/org/tasks/caldav/iCalendar.kt b/app/src/main/java/org/tasks/caldav/iCalendar.kt index 95fbb07a8..c42e3088a 100644 --- a/app/src/main/java/org/tasks/caldav/iCalendar.kt +++ b/app/src/main/java/org/tasks/caldav/iCalendar.kt @@ -1,8 +1,8 @@ package org.tasks.caldav -import at.bitfire.ical4android.DateUtils.ical4jTimeZone import at.bitfire.ical4android.Task import at.bitfire.ical4android.Task.Companion.tasksFromReader +import at.bitfire.ical4android.util.DateUtils.ical4jTimeZone import com.todoroo.andlib.utility.DateUtilities import com.todoroo.astrid.alarms.AlarmService import com.todoroo.astrid.dao.TaskDao diff --git a/app/src/main/java/org/tasks/data/MyAndroidTask.kt b/app/src/main/java/org/tasks/data/MyAndroidTask.kt index 259fb6954..ada25eab7 100644 --- a/app/src/main/java/org/tasks/data/MyAndroidTask.kt +++ b/app/src/main/java/org/tasks/data/MyAndroidTask.kt @@ -6,7 +6,7 @@ import android.net.Uri import at.bitfire.ical4android.* import at.bitfire.ical4android.BatchOperation.CpoBuilder.Companion.newInsert import at.bitfire.ical4android.BatchOperation.CpoBuilder.Companion.newUpdate -import at.bitfire.ical4android.MiscUtils.CursorHelper.toValues +import at.bitfire.ical4android.util.MiscUtils.CursorHelper.toValues import net.fortuna.ical4j.model.Parameter import net.fortuna.ical4j.model.parameter.RelType import net.fortuna.ical4j.model.parameter.Related diff --git a/deps_fdroid.txt b/deps_fdroid.txt index aa5dc2bc8..848d06486 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -66,20 +66,33 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.7.20 (*) ++--- com.github.tasks:dav4jvm:deb2c9aef8 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.7.20 (*) -+| \--- org.apache.commons:commons-lang3:3.8.1 -++--- com.github.tasks:ical4android:0e928b567c -+| +--- org.mnode.ical4j:ical4j:3.0.21 -+| | +--- org.slf4j:slf4j-api:1.7.25 -> 1.7.30 -+| | +--- commons-codec:commons-codec:1.11 -+| | +--- org.apache.commons:commons-lang3:3.8.1 -+| | \--- org.apache.commons:commons-collections4:4.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.7.20 (*) -+| +--- com.sun.mail:android-mail:1.6.5 -+| | \--- com.sun.mail:android-activation:1.6.5 ++| \--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 +++--- com.github.tasks:ical4android:2fb465b ++| +--- org.mnode.ical4j:ical4j:3.2.5 ++| | +--- javax.cache:cache-api:1.1.1 ++| | +--- org.threeten:threeten-extra:1.7.0 ++| | +--- org.jparsec:jparsec:3.1 ++| | +--- com.github.erosb:everit-json-schema:1.14.1 ++| | | +--- commons-validator:commons-validator:1.7 ++| | | | +--- commons-beanutils:commons-beanutils:1.9.4 ++| | | | | \--- commons-collections:commons-collections:3.2.2 ++| | | | +--- commons-digester:commons-digester:2.1 ++| | | | \--- commons-collections:commons-collections:3.2.2 ++| | | +--- com.damnhandy:handy-uri-templates:2.1.8 ++| | | | \--- joda-time:joda-time:2.10.2 ++| | | \--- com.google.re2j:re2j:1.6 ++| | +--- org.slf4j:slf4j-api:1.7.36 -> 2.0.3 ++| | +--- commons-codec:commons-codec:1.15 ++| | +--- org.apache.commons:commons-lang3:3.12.0 ++| | +--- org.apache.commons:commons-collections4:4.4 ++| | \--- commons-validator:commons-validator:1.7 (*) ++| +--- org.apache.commons:commons-collections4:4.2 -> 4.4 ++| +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 (*) +| +--- commons-io:commons-io:2.6 -+| +--- org.slf4j:slf4j-jdk14:1.7.30 -+| | \--- org.slf4j:slf4j-api:1.7.30 -+| \--- androidx.core:core-ktx:1.3.2 -> 1.9.0 ++| +--- org.slf4j:slf4j-jdk14:2.0.3 ++| | \--- org.slf4j:slf4j-api:2.0.3 ++| \--- androidx.core:core-ktx:1.9.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| +--- androidx.core:core:1.9.0 +| | +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index b6e908251..e86da74e8 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -313,20 +313,33 @@ +| \--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.1 (*) ++--- com.github.tasks:dav4jvm:deb2c9aef8 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.7.20 (*) -+| \--- org.apache.commons:commons-lang3:3.8.1 -++--- com.github.tasks:ical4android:0e928b567c -+| +--- org.mnode.ical4j:ical4j:3.0.21 -+| | +--- org.slf4j:slf4j-api:1.7.25 -> 1.7.30 -+| | +--- commons-codec:commons-codec:1.11 -+| | +--- org.apache.commons:commons-lang3:3.8.1 -+| | \--- org.apache.commons:commons-collections4:4.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -> 1.7.20 (*) -+| +--- com.sun.mail:android-mail:1.6.5 -+| | \--- com.sun.mail:android-activation:1.6.5 ++| \--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 +++--- com.github.tasks:ical4android:2fb465b ++| +--- org.mnode.ical4j:ical4j:3.2.5 ++| | +--- javax.cache:cache-api:1.1.1 ++| | +--- org.threeten:threeten-extra:1.7.0 ++| | +--- org.jparsec:jparsec:3.1 ++| | +--- com.github.erosb:everit-json-schema:1.14.1 ++| | | +--- commons-validator:commons-validator:1.7 ++| | | | +--- commons-beanutils:commons-beanutils:1.9.4 ++| | | | | \--- commons-collections:commons-collections:3.2.2 ++| | | | +--- commons-digester:commons-digester:2.1 ++| | | | \--- commons-collections:commons-collections:3.2.2 ++| | | +--- com.damnhandy:handy-uri-templates:2.1.8 ++| | | | \--- joda-time:joda-time:2.10.2 ++| | | \--- com.google.re2j:re2j:1.6 ++| | +--- org.slf4j:slf4j-api:1.7.36 -> 2.0.3 ++| | +--- commons-codec:commons-codec:1.15 ++| | +--- org.apache.commons:commons-lang3:3.12.0 ++| | +--- org.apache.commons:commons-collections4:4.4 ++| | \--- commons-validator:commons-validator:1.7 (*) ++| +--- org.apache.commons:commons-collections4:4.2 -> 4.4 ++| +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 (*) +| +--- commons-io:commons-io:2.6 -+| +--- org.slf4j:slf4j-jdk14:1.7.30 -+| | \--- org.slf4j:slf4j-api:1.7.30 -+| \--- androidx.core:core-ktx:1.3.2 -> 1.9.0 (*) ++| +--- org.slf4j:slf4j-jdk14:2.0.3 ++| | \--- org.slf4j:slf4j-api:2.0.3 ++| \--- androidx.core:core-ktx:1.9.0 (*) ++--- com.github.bitfireAT:cert4android:7814052 +| +--- androidx.databinding:databinding-common:7.2.0 -> 7.3.1 +| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.3.1 (*)