Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit cfd553df authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update gradle plugin, compile SDK level, compile tools, dependencies

parent a334d4fd

build.gradle

+5 −5
Original line number Diff line number Diff line
@@ -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'

src/main/java/at/bitfire/ical4android/AndroidEvent.kt

+7 −7
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ abstract class AndroidEvent( 
        // 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

                null /* not possible by if statement */ -> null

                Status.VEVENT_CONFIRMED -> Events.STATUS_CONFIRMED

                Status.VEVENT_CANCELLED -> Events.STATUS_CANCELED

                else -> Events.STATUS_TENTATIVE