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

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

Update Kotlin, gradle, gradle plugin

parent d7b73a35

app/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ dependencies { 
    implementation project(':vcard4android')



    implementation 'androidx.multidex:multidex:2.0.1'

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"



    implementation 'androidx.appcompat:appcompat:1.0.2'

    implementation 'androidx.cardview:cardview:1.0.0'

build.gradle

+7 −5
Original line number Diff line number Diff line
@@ -7,17 +7,19 @@ 
 */



buildscript {

    ext.dokka_version = '0.9.17'

    ext.kotlin_version = '1.3.21'

    ext.versions = [

        kotlin: '1.3.30',

        dokka: '0.9.17'

    ]



    repositories {

        jcenter()

        google()

    }

    dependencies {

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

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

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

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

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

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

    }

}

cert4android @ aae988de

Compare b1f57b51 to aae988de
Original line number Diff line number Diff line 
Subproject commit b1f57b518f7595eabf9842d0b950cdc82f0e21db
 
Subproject commit aae988de2107873e2130b175969ce9b49e8fc0b6

dav4jvm @ 3866bb27

Compare f141bd62 to 3866bb27
Original line number Diff line number Diff line 
Subproject commit f141bd620f58155231b6b45a38e8e29212a5165e
 
Subproject commit 3866bb2725cae131d3490f2692bc15b9e1396bc8

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
#Thu Mar 29 12:34:22 CEST 2018

#Wed Apr 17 22:31:47 CEST 2019

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip