diff options
author | Roman Nurik <roman@nurik.net> | 2014-12-08 22:41:52 -0500 |
---|---|---|
committer | Roman Nurik <roman@nurik.net> | 2014-12-08 22:41:52 -0500 |
commit | 61d92cecf65b8e3d3e174711e6559795348f4306 (patch) | |
tree | f5eef3bda7d7d1155c0ce10b67f946f620838128 | |
parent | 91e54a578143947f812760f760cff2b315817df4 (diff) | |
parent | b1b299764217127b77ee538d4e328ac1e2ba53a8 (diff) | |
download | iosched-61d92cecf65b8e3d3e174711e6559795348f4306.tar.gz |
Merge pull request #93 from wmora/master
Gradle config update to work with AS 1.0 RC4
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | android/build.gradle | 4 | ||||
-rw-r--r-- | build.gradle | 2 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index a5acfea..540819e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ language: android android: components: - - build-tools-21.0.2 + - build-tools-21.1.1 - android-20 - android-21 - extra-google-m2repository diff --git a/android/build.gradle b/android/build.gradle index fb51cb3..737c141 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ repositories { android { compileSdkVersion 21 - buildToolsVersion "21.0.2" + buildToolsVersion "21.1.1" defaultConfig { minSdkVersion 14 @@ -53,7 +53,7 @@ android { signingConfig signingConfigs.debug } release { - runProguard true + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), file('proguard-project.txt') signingConfig signingConfigs.release } diff --git a/build.gradle b/build.gradle index ca820e2..bf3a80f 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' + classpath 'com.android.tools.build:gradle:1.0.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3a78919..137e0e6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip |