mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-12-22 19:01:30 +00:00
Updated dependencies.
This commit is contained in:
parent
f4c15a98e6
commit
80b0578b73
2 changed files with 13 additions and 7 deletions
16
build.gradle
16
build.gradle
|
@ -6,7 +6,7 @@ buildscript {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:1.3.1'
|
||||
classpath 'com.android.tools.build:gradle:2.0.0'
|
||||
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
|
||||
classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
|
||||
}
|
||||
|
@ -20,10 +20,9 @@ repositories {
|
|||
mavenCentral()
|
||||
jcenter()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile 'eu.chainfire:libsuperuser:1.0.0.201602271131'
|
||||
compile 'com.android.support:design:23.1.1'
|
||||
compile 'com.android.support:design:23.3.0'
|
||||
compile 'com.google.zxing:android-integration:3.2.1'
|
||||
androidTestCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
|
||||
}
|
||||
|
@ -34,8 +33,6 @@ android {
|
|||
compileSdkVersion 23
|
||||
buildToolsVersion "23.0.2"
|
||||
|
||||
useLibrary 'org.apache.http.legacy'
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.nutomic.syncthingandroid"
|
||||
minSdkVersion 11
|
||||
|
@ -54,6 +51,15 @@ android {
|
|||
}
|
||||
}
|
||||
|
||||
// Without this parameter, all builds fail with error:
|
||||
// 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)
|
||||
|
||||
// We haven't upgraded to the new HTTP library yet.
|
||||
useLibrary 'org.apache.http.legacy'
|
||||
|
||||
signingConfigs {
|
||||
release {
|
||||
if (System.getenv("key_alias")) {
|
||||
|
|
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.9-all.zip
|
||||
distributionSha256Sum=4647967f8de78d6d6d8093cdac50f368f8c2b8038f41a5afe1c3bce4c69219a9
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
|
||||
distributionSha256Sum=d8b1948a575dc9ec13e03db94502ce91815d73da023f611296c04b852164cb5f
|
||||
|
|
Loading…
Reference in a new issue