Merge branch 'tools-23' into 'master'
Revert to build-tools 23 until we can have 64-bit As long as we're stuck with 32-bit on the buildserver, avoid both target and build-tools 24. Necessary to do an alpha. See merge request !349
This commit is contained in:
commit
f3fffd9f2e
@ -1,4 +1,4 @@
|
|||||||
image: mvdan/fdroid-ci:client-20160621
|
image: mvdan/fdroid-ci:client-20160706
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
|
@ -11,7 +11,7 @@ dependencies {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 23
|
compileSdkVersion 23
|
||||||
buildToolsVersion '24'
|
buildToolsVersion '23.0.3'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 8
|
minSdkVersion 8
|
||||||
|
@ -140,7 +140,7 @@ if (!hasProperty('sourceDeps')) {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 23
|
compileSdkVersion 23
|
||||||
buildToolsVersion '24'
|
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 '24'
|
buildToolsVersion '23.0.3'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 8
|
minSdkVersion 8
|
||||||
|
Loading…
x
Reference in New Issue
Block a user