From 212e07b53e29e3fb115e5e8bce64e6e1c25728c0 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Mon, 24 Nov 2014 00:32:47 -0500 Subject: [PATCH] Revert back to SDK 20, but use plugin 14.0 Allows Android Studio (needs plugin 14) and Travis (20) to hopefully play nice --- app/build.gradle | 6 ------ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9ee945a..60fb8c4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,12 +17,6 @@ android { versionCode 1 versionName '1.0' } - buildTypes { - release { - runProguard false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } packagingOptions { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' diff --git a/build.gradle b/build.gradle index b679517..bbee149 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.13.+' + classpath 'com.android.tools.build:gradle:0.14.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // 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 775c213..b096445 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 17 21:43:00 EST 2014 +#Mon Nov 24 00:24:09 EST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip