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

Commit 03f3b94f authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Fix tests, update Kotlin/gradle plugin

parent 01a09e8f

build.gradle

+3 −2
Original line number Diff line number Diff line 


buildscript {

    ext.kotlin_version = '1.3.20'

    ext.kotlin_version = '1.3.21'

    ext.dokka_version = '0.9.17'



    repositories {
@@ -9,7 +9,7 @@ buildscript { 
    }



    dependencies {

        classpath 'com.android.tools.build:gradle:3.3.0'

        classpath 'com.android.tools.build:gradle:3.3.1'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"

    }
@@ -61,6 +61,7 @@ dependencies { 
    implementation 'org.slf4j:slf4j-jdk14:1.7.25'

    implementation 'androidx.core:core-ktx:1.0.1'



    androidTestImplementation 'androidx.test:core:1.1.0'

    androidTestImplementation 'androidx.test:runner:1.1.1'

    androidTestImplementation 'androidx.test:rules:1.1.1'

src/androidTest/java/at/bitfire/ical4android/MiscUtilsTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -65,11 +65,11 @@ class MiscUtilsTest { 
        // DATE (without time)

        assertEquals(TimeZones.UTC_ID, MiscUtils.getTzId(DtStart(Date("20150101"))))



        // DATE-TIME without time zone (floating time): should be UTC (because net.fortuna.ical4j.timezone.date.floating=false)

        assertEquals(TimeZones.UTC_ID, MiscUtils.getTzId(DtStart(DateTime("20150101T000000"))))

        // DATE-TIME without time zone (floating time): should be local time zone (because Android doesn't support floating times)

        assertEquals(java.util.TimeZone.getDefault().id, MiscUtils.getTzId(DtStart(DateTime("20150101T000000"))))



        // DATE-TIME without time zone (UTC)

        assertEquals(TimeZones.UTC_ID, MiscUtils.getTzId(DtStart(DateTime(1438607288000L))))

        assertEquals(TimeZones.UTC_ID, MiscUtils.getTzId(DtStart(DateTime(1438607288000L), true)))



        // DATE-TIME with time zone

        assertEquals(tzVienna.id, MiscUtils.getTzId(DtStart(DateTime("20150101T000000", tzVienna))))