Merge branch 'ci-image' into 'master'
Update to april 5th docker image * Debian 8.4 * Now includes curl * No longer has android-10 * build-tools 23.0.3 See merge request !254
This commit is contained in:
commit
74713810dd
@ -1,4 +1,4 @@
|
|||||||
image: mvdan/fdroid-ci:client-20160329
|
image: mvdan/fdroid-ci:client-20160405
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
@ -11,8 +11,6 @@ variables:
|
|||||||
|
|
||||||
gradle:
|
gradle:
|
||||||
script:
|
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 --filter android-$AVD_SDK
|
||||||
- echo y | android update sdk --no-ui --all --filter sys-img-armeabi-v7a-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
|
- export GRADLE_USER_HOME=$PWD/.gradle
|
||||||
|
@ -11,7 +11,7 @@ dependencies {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 23
|
compileSdkVersion 23
|
||||||
buildToolsVersion '23.0.2'
|
buildToolsVersion '23.0.3'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 8
|
minSdkVersion 8
|
||||||
|
@ -122,7 +122,7 @@ if (!hasProperty('sourceDeps')) {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 23
|
compileSdkVersion 23
|
||||||
buildToolsVersion '23.0.2'
|
buildToolsVersion '23.0.3'
|
||||||
useLibrary 'org.apache.http.legacy'
|
useLibrary 'org.apache.http.legacy'
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 23
|
compileSdkVersion 23
|
||||||
buildToolsVersion '23.0.2'
|
buildToolsVersion '23.0.3'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 8
|
minSdkVersion 8
|
||||||
|
Loading…
x
Reference in New Issue
Block a user