diff options
| author | Ricki Hirner <hirner@bitfire.at> | 2022-07-07 23:10:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-07 23:10:14 +0300 |
| commit | 22dfb270ee783290a635ad4e3594fd8c9ad3d5ec (patch) | |
| tree | c9a3f9233f8805d26d4000c372bd9966c240b037 | |
| parent | 40618b8c2b018ee61e299c7587334f5fd4278552 (diff) | |
Update dependencies (#46)
* Update dependencies
* Trying to fix the Overload resolution ambiguity error for tests
Co-authored-by: Patrick Lang <72232737+patrickunterwegs@users.noreply.github.com>
| -rw-r--r-- | build.gradle | 7 | ||||
| -rw-r--r-- | src/main/java/at/bitfire/ical4android/JtxICalObject.kt | 18 |
2 files changed, 14 insertions, 11 deletions
diff --git a/build.gradle b/build.gradle index 99e65ca..5feb4ab 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,9 @@ buildscript { ext.versions = [ - kotlin: '1.6.21', + kotlin: '1.7.0', dokka: '1.5.0', - ical4j: '3.1.2', + ical4j: '3.2.0', // tests fail with >= 3.2.1: https://github.com/ical4j/ical4j/issues/350#issuecomment-1177290922 – update as soon as this is fixed // latest Apache Commons versions that don't require Java 8 (Android 7) commonsIO: '2.6' ] @@ -55,7 +55,6 @@ android { } kotlinOptions { jvmTarget = "1.8" - useIR = true } packagingOptions { resources { @@ -82,7 +81,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6' api("org.mnode.ical4j:ical4j:${versions.ical4j}") { exclude module: 'javax.mail' diff --git a/src/main/java/at/bitfire/ical4android/JtxICalObject.kt b/src/main/java/at/bitfire/ical4android/JtxICalObject.kt index cfaae2f..91d53ed 100644 --- a/src/main/java/at/bitfire/ical4android/JtxICalObject.kt +++ b/src/main/java/at/bitfire/ical4android/JtxICalObject.kt @@ -273,13 +273,17 @@ open class JtxICalObject( } // remove properties to add the rest to other - component.properties.remove(component.action) - component.properties.remove(component.summary) - component.properties.remove(component.description) - component.properties.remove(component.duration) - component.properties.remove(component.attachment) - component.properties.remove(component.repeat) - component.properties.remove(component.trigger) + component.properties.removeAll( + setOf( + component.action, + component.summary, + component.description, + component.duration, + component.attachment, + component.repeat, + component.trigger + ) + ) component.properties?.let { vAlarmProps -> this.other = JtxContract.getJsonStringFromXProperties(vAlarmProps) } } iCalObject.alarms.add(jtxAlarm) |