Commit 7054c635 authored by Ricki Hirner's avatar Ricki Hirner

Update build tools, gradle, support library

parent 07df1dc2
Pipeline #13300250 passed with stage
in 1 minute and 59 seconds
......@@ -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)
cache:
paths:
......
buildscript {
ext.kotlin_version = '1.1.4-3'
ext.kotlin_version = '1.1.51'
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"
}
}
......@@ -24,7 +27,7 @@ apply plugin: 'kotlin-android'
android {
compileSdkVersion 26
buildToolsVersion '26.0.1'
buildToolsVersion '26.0.2'
defaultConfig {
minSdkVersion 14
......
......@@ -11,4 +11,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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment