mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-12-22 19:01:30 +00:00
Downgrade build tools to 1.3, enable res cruncher (fixes #632).
This commit is contained in:
parent
fc28e1eb70
commit
419f973e65
2 changed files with 8 additions and 4 deletions
|
@ -6,7 +6,7 @@ buildscript {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.0.0'
|
||||
classpath 'com.android.tools.build:gradle:1.3.1'
|
||||
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
|
||||
classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
|
||||
}
|
||||
|
@ -49,7 +49,11 @@ android {
|
|||
// Execution failed for task ':mergeArmeabiDebugResources'.
|
||||
// > Some file crunching failed, see logs for details
|
||||
// https://code.google.com/p/android/issues/detail?id=163378
|
||||
aaptOptions.setProperty("cruncherEnabled", false)
|
||||
//
|
||||
// NOTE: Setting this causes a crash when opening the DeviceFragment:
|
||||
// Resources$NotFoundException: File res/drawable/ic_tag_text_outline_black_24dp.xml
|
||||
// This means we can't use build tools 2.0 until this is fixed.
|
||||
//aaptOptions.setProperty("cruncherEnabled", false)
|
||||
|
||||
// We haven't upgraded to the new HTTP library yet.
|
||||
useLibrary 'org.apache.http.legacy'
|
||||
|
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
|
|||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
|
||||
distributionSha256Sum=d8b1948a575dc9ec13e03db94502ce91815d73da023f611296c04b852164cb5f
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip
|
||||
distributionSha256Sum=4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9
|
||||
|
|
Loading…
Reference in a new issue