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

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

Update Kotlin, dokka, gradle plugin, build tools, target SDK

parent cc71df5e

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ cache: 


test:

  script:

    #- (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh)

    #- ./gradlew check connectedCheck

    - ./gradlew check

  artifacts:

    paths:

build.gradle

+6 −6
Original line number Diff line number Diff line 


buildscript {

    ext.kotlin_version = '1.2.51'

    ext.dokka_version = '0.9.16'

    ext.kotlin_version = '1.2.61'

    ext.dokka_version = '0.9.17'



    repositories {

        jcenter()
@@ -9,7 +9,7 @@ buildscript { 
    }



    dependencies {

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

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

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

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

    }
@@ -29,13 +29,13 @@ ext { 
}



android {

    compileSdkVersion 27

    buildToolsVersion '28.0.1'

    compileSdkVersion 28

    buildToolsVersion '28.0.2'



    defaultConfig {

        //noinspection MinSdkTooLow

        minSdkVersion 9        // Android 2.3

        targetSdkVersion 27

        targetSdkVersion 28



        buildConfigField "String", "version_okhttp", "\"$okhttp_version\""

    }