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

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

Update gradle plugin, Kotlin

parent eb49dc29

build.gradle

+9 −9
Original line number Diff line number Diff line 


buildscript {

    ext.kotlin_version = '1.2.40'

    ext.kotlin_version = '1.2.41'

    ext.dokka_version = '0.9.16'



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



    dependencies {

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

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

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

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

    }
@@ -54,13 +54,13 @@ android { 
}



dependencies {

    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

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



    compile 'org.apache.commons:commons-text:1.1'

    compile 'commons-io:commons-io:2.6'

    implementation 'org.apache.commons:commons-text:1.1'

    implementation 'commons-io:commons-io:2.6'



    // ez-vcard to parse/generate VCards

    compile('com.googlecode.ez-vcard:ez-vcard:0.10.4') {

    api('com.googlecode.ez-vcard:ez-vcard:0.10.4') {

        // hCard functionality not needed

        exclude group: 'org.jsoup'

        exclude group: 'org.freemarker'
@@ -68,8 +68,8 @@ dependencies { 
        exclude group: 'com.fasterxml.jackson.core'

    }



    androidTestCompile 'com.android.support.test:runner:1.0.1'

    androidTestCompile 'com.android.support.test:rules:1.0.1'

    androidTestImplementation 'com.android.support.test:runner:1.0.2'

    androidTestImplementation 'com.android.support.test:rules:1.0.2'



    testCompile 'junit:junit:4.12'

    testImplementation 'junit:junit:4.12'

}