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

Commit 9712a8d6 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update Kotlin, gradle plugin, appcompat

parent 1ead10b7
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line


buildscript {
buildscript {
    ext.versions = [
    ext.versions = [
        kotlin: '1.3.31',
        kotlin: '1.3.41',
        dokka: '0.9.18',
        dokka: '0.9.18',
        conscrypt: '2.1.0'
        conscrypt: '2.1.0'
    ]
    ]
@@ -12,7 +12,7 @@ buildscript {
    }
    }


    dependencies {
    dependencies {
        classpath 'com.android.tools.build:gradle:3.4.1'
        classpath 'com.android.tools.build:gradle:3.4.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}"
        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}"
    }
    }
@@ -51,7 +51,7 @@ android {
dependencies {
dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"


    implementation 'androidx.appcompat:appcompat:1.0.2'
    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
    implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'
    implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'