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

Commit fc6cf159 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update Kotlin, gradle; move lambda expressions out of parentheses

parent 1ee63a75

build.gradle

+2 −2
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 {
@@ -25,7 +25,7 @@ apply plugin: 'kotlin-android' 
apply plugin: 'org.jetbrains.dokka-android'



ext {

    okhttp_version = "3.10.0"

    okhttp_version = '3.10.0'

}



android {

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,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/main/java/at/bitfire/dav4android/property/CurrentUserPrincipal.kt

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ data class CurrentUserPrincipal( 
        override fun create(parser: XmlPullParser): CurrentUserPrincipal {

            // <!ELEMENT current-user-principal (unauthenticated | href)>

            var href: String? = null

            XmlUtils.processTag(parser, XmlUtils.NS_WEBDAV, "href", {

            XmlUtils.processTag(parser, XmlUtils.NS_WEBDAV, "href") {

                href = XmlUtils.readText(parser)

            })

            }

            return CurrentUserPrincipal(href)

        }

src/main/java/at/bitfire/dav4android/property/CurrentUserPrivilegeSet.kt

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ data class CurrentUserPrivilegeSet( 
            // <!ELEMENT privilege ANY>

            val privs = CurrentUserPrivilegeSet(false, false)



            XmlUtils.processTag(parser, XmlUtils.NS_WEBDAV, "privilege", {

            XmlUtils.processTag(parser, XmlUtils.NS_WEBDAV, "privilege") {

                val depth = parser.depth

                var eventType = parser.eventType

                while (!(eventType == XmlPullParser.END_TAG && parser.depth == depth)) {
@@ -49,7 +49,7 @@ data class CurrentUserPrivilegeSet( 
                        }

                    eventType = parser.next()

                }

            })

            }



            return privs

        }

src/main/java/at/bitfire/dav4android/property/SupportedAddressData.kt

+2 −2
Original line number Diff line number Diff line
@@ -36,13 +36,13 @@ class SupportedAddressData: Property { 
            val supported = SupportedAddressData()



            try {

                XmlUtils.processTag(parser, XmlUtils.NS_CARDDAV, "address-data-type", {

                XmlUtils.processTag(parser, XmlUtils.NS_CARDDAV, "address-data-type") {

                    parser.getAttributeValue(null, "content-type")?.let { contentType ->

                        var type = contentType

                        parser.getAttributeValue(null, "version")?.let { version -> type += "; version=$version" }

                        MediaType.parse(type)?.let { supported.types.add(it) }

                    }

                })

                }

            } catch(e: XmlPullParserException) {

                Constants.log.log(Level.SEVERE, "Couldn't parse <resourcetype>", e)

                return null