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

Commit 207a7c32 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update Kotlin, gradle; move lambda expressions out of parentheses; remove unnecessary lateinit

parent c82bbf1f

build.gradle

+1 −1
Original line number Diff line number Diff line 


buildscript {

    ext.kotlin_version = '1.2.41'

    ext.kotlin_version = '1.2.50'

    ext.dokka_version = '0.9.16'



    repositories {

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

src/androidTest/java/at/bitfire/vcard4android/AndroidContactTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ class AndroidContactTest { 
        vcard.displayName = "Large Transaction (one row which is too large)"



        // 1 MB eTag ... have fun

        val data = CharArray(1024*1024, { 'x' })

        val data = CharArray(1024*1024) { 'x' }

        val eTag = String(data)



        val contact = AndroidContact(addressBook, vcard, null, eTag)

src/main/java/at/bitfire/vcard4android/BatchOperation.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class BatchOperation( 
) {



    private val queue = LinkedList<Operation>()

    private lateinit var results: Array<ContentProviderResult?>

    private var results = arrayOfNulls<ContentProviderResult?>(0)





    fun nextBackrefIdx() = queue.size

src/main/java/at/bitfire/vcard4android/Contact.kt

+2 −2
Original line number Diff line number Diff line
@@ -441,8 +441,8 @@ class Contact { 
            }

            return null

        }

        anniversary?.let { vCard.anniversary = dateOrPartialDate(it, { time -> Anniversary(time, false) }) }

        birthDay?.let { vCard.birthday = dateOrPartialDate(it, { time -> Birthday(time, false) }) }

        anniversary?.let { vCard.anniversary = dateOrPartialDate(it) { time -> Anniversary(time, false) } }

        birthDay?.let { vCard.birthday = dateOrPartialDate(it) { time -> Birthday(time, false) } }



        // RELATED

        relations.forEach { vCard.addRelated(it) }