From 53c87524443ce935d41f830a1c59af6ce5855ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 5 Apr 2016 10:43:48 +0100 Subject: [PATCH] Update to april 5th docker image * Debian 8.4 * Now includes curl * No longer has android-10 * build-tools 23.0.3 --- .gitlab-ci.yml | 4 +--- Privileged-Extension/build.gradle | 2 +- app/build.gradle | 2 +- privileged-api-lib/build.gradle | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a755ccc9e..99727d8dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: mvdan/fdroid-ci:client-20160329 +image: mvdan/fdroid-ci:client-20160405 cache: paths: @@ -11,8 +11,6 @@ variables: gradle: script: - - apt-get -y update - - apt-get -y install curl - echo y | android update sdk --no-ui --filter android-$AVD_SDK - echo y | android update sdk --no-ui --all --filter sys-img-armeabi-v7a-android-$AVD_SDK - export GRADLE_USER_HOME=$PWD/.gradle diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle index 086188004..6e171e434 100644 --- a/Privileged-Extension/build.gradle +++ b/Privileged-Extension/build.gradle @@ -11,7 +11,7 @@ dependencies { android { compileSdkVersion 23 - buildToolsVersion '23.0.2' + buildToolsVersion '23.0.3' defaultConfig { minSdkVersion 8 diff --git a/app/build.gradle b/app/build.gradle index 8f53c13bc..2eaebe349 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -122,7 +122,7 @@ if (!hasProperty('sourceDeps')) { android { compileSdkVersion 23 - buildToolsVersion '23.0.2' + buildToolsVersion '23.0.3' useLibrary 'org.apache.http.legacy' buildTypes { diff --git a/privileged-api-lib/build.gradle b/privileged-api-lib/build.gradle index 69bfa33b1..ef9bd8b99 100644 --- a/privileged-api-lib/build.gradle +++ b/privileged-api-lib/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion '23.0.2' + buildToolsVersion '23.0.3' defaultConfig { minSdkVersion 8