diff --git a/app/build.gradle b/app/build.gradle index 5ef612cd..169f55d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,6 +34,7 @@ model { android.buildTypes { release { minifyEnabled = true + useProguard = true proguardFiles.add(file('proguard-rules.pro')) // TODO remove on stable release ndk.with { @@ -42,6 +43,7 @@ model { } debug { ndk.with { + useProguard = false debuggable = true } } @@ -50,6 +52,9 @@ model { create("all") { } } + android.lintOptions { + abortOnError false + } } dependencies { diff --git a/build.gradle b/build.gradle index fd622d98..08237360 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { // http://tools.android.com/tech-docs/new-build-system/gradle-experimental - classpath 'com.android.tools.build:gradle-experimental:0.6.0-alpha1' + classpath 'com.android.tools.build:gradle-experimental:0.6.0-alpha5' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 757d1a78..c0a91c95 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 06 12:15:50 CET 2016 +#Sun Feb 07 14:26:09 CET 2016 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 +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip