diff options
| author | Ricki Hirner <hirner@bitfire.at> | 2022-09-27 11:56:21 +0300 |
|---|---|---|
| committer | Ricki Hirner <hirner@bitfire.at> | 2022-09-27 12:28:32 +0300 |
| commit | cfd553df575eb18b0acf51e9ddf1f11bc2b14e37 (patch) | |
| tree | e9a0f8c0fc0b0ed516d00d5b01c521e5e0bbb4d5 | |
| parent | a334d4fd7da36a230e9287dbb62ccd8513f3fa58 (diff) | |
Update gradle plugin, compile SDK level, compile tools, dependencies
| -rw-r--r-- | build.gradle | 10 | ||||
| -rw-r--r-- | src/main/java/at/bitfire/ical4android/AndroidEvent.kt | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/build.gradle b/build.gradle index 866151f..ccec49b 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" } @@ -33,8 +33,8 @@ apply plugin: 'kotlin-android' apply plugin: 'org.jetbrains.dokka' android { - compileSdkVersion 32 - buildToolsVersion '32.0.0' + compileSdkVersion 33 + buildToolsVersion '33.0.0' defaultConfig { minSdkVersion 21 // Android 5.0 @@ -80,7 +80,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6' // 2.0.0 produces "Unsupported desugared library configuration version, please upgrade the D8/R8 compiler." api("org.mnode.ical4j:ical4j:${versions.ical4j}") { // exclude modules which are in conflict with system libraries @@ -100,7 +100,7 @@ dependencies { implementation "commons-io:commons-io:${versions.commonsIO}" implementation 'org.slf4j:slf4j-jdk14:1.7.36' - implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.core:core-ktx:1.9.0' androidTestImplementation 'androidx.test:core:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' diff --git a/src/main/java/at/bitfire/ical4android/AndroidEvent.kt b/src/main/java/at/bitfire/ical4android/AndroidEvent.kt index 7c354a6..9f593ea 100644 --- a/src/main/java/at/bitfire/ical4android/AndroidEvent.kt +++ b/src/main/java/at/bitfire/ical4android/AndroidEvent.kt @@ -894,15 +894,15 @@ abstract class AndroidEvent( builder .withValue(Events.HAS_ATTENDEE_DATA, 0) .withValue(Events.ORGANIZER, calendar.ownerAccount) - // Attention: don't update event with STATUS != null to STATUS = null (causes calendar provider operation to fail)! + // Attention: don't update event with STATUS != null to STATUS = null (causes calendar provider operation to fail)! // In this case, the whole event must be deleted and inserted again. if (/* insert, not an update */ id == null || /* update, but we're not updating to null */ event.status != null) - builder.withValue(Events.STATUS, when (event.status) { - null -> null - Status.VEVENT_CONFIRMED -> Events.STATUS_CONFIRMED - Status.VEVENT_CANCELLED -> Events.STATUS_CANCELED - else -> Events.STATUS_TENTATIVE - }) + builder.withValue(Events.STATUS, when (event.status) { + null /* not possible by if statement */ -> null + Status.VEVENT_CONFIRMED -> Events.STATUS_CONFIRMED + Status.VEVENT_CANCELLED -> Events.STATUS_CANCELED + else -> Events.STATUS_TENTATIVE + }) builder .withValue(Events.AVAILABILITY, if (event.opaque) Events.AVAILABILITY_BUSY else Events.AVAILABILITY_FREE) .withValue(Events.ACCESS_LEVEL, when (event.classification) { |