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

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

Update build tools, gradle, support library

parent 83dab17f

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ image: registry.gitlab.com/bitfireat/davdroid:latest 


before_script:

  - export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew

  - emulator64-x86 -avd test -no-audio -no-window & wait-for-emulator.sh

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

  - wget -q https://f-droid.org/repo/org.dmfs.tasks_481.apk && adb install org.dmfs.tasks_481.apk



cache:

build.gradle

+5 −2
Original line number Diff line number Diff line
@@ -4,10 +4,13 @@ buildscript { 


    repositories {

        jcenter()

        maven {

            url "https://maven.google.com"

        }

    }



    dependencies {

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

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

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

    }

}
@@ -21,7 +24,7 @@ apply plugin: 'kotlin-android' 


android {

    compileSdkVersion 26

    buildToolsVersion '26.0.1'

    buildToolsVersion '26.0.2'



    defaultConfig {

        minSdkVersion 16

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip