From 8a46cb0037651d7593145b749ea7e7f3a39125ba Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Mon, 24 Nov 2014 00:09:16 -0500 Subject: [PATCH] Revert "Get everything set for API 21" This reverts commit d94b8b45c720c19401bedd3051496752d8ac7736. --- .travis.yml | 4 ---- app/build.gradle | 14 ++++++++++---- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c270ed..4be7cf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ # We still need android to get the build tools/support libraries language: android -android: - components: - - build-tools-21.1.1 - # Don't have any other tools so far, robolectric covers pretty much everything... script: - ./gradlew test diff --git a/app/build.gradle b/app/build.gradle index f8ca179..9ee945a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,15 +8,21 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 21 - buildToolsVersion '21.1.1' + compileSdkVersion 20 + buildToolsVersion '20.0.0' defaultConfig { applicationId 'org.bspeice.minimalbible' minSdkVersion 8 - targetSdkVersion 21 + targetSdkVersion 20 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' @@ -47,7 +53,7 @@ dependencies { compile 'com.jakewharton:butterknife:+' compile 'com.readystatesoftware.systembartint:systembartint:+' compile 'com.netflix.rxjava:rxjava-android:+' - compile 'com.android.support:appcompat-v7:21.+' + compile 'com.android.support:appcompat-v7:20.+' compile 'org.apache.commons:commons-lang3:+' compile 'com.google.code.gson:gson:+' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/build.gradle b/build.gradle index 4e512fd..b679517 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.14.2' + classpath 'com.android.tools.build:gradle:0.13.+' 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 e5cb9b8..775c213 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Nov 23 22:14:54 EST 2014 +#Mon Nov 17 21:43:00 EST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip