From 6c8f92e742f86bd5164e13908144b48dbee46e8e Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sun, 9 Nov 2014 23:55:23 -0500 Subject: [PATCH] Revert "Some more build fixes - use Android-Gradle .14" This reverts commit 51a3dd3eacb6a011e7957a1749222353e5db3b18. --- .travis.yml | 2 +- app/build.gradle | 2 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cc37d5..57901cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ android: env: matrix: - - ANDROID_SDKS=android-21,sysimg-21 ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7 + - ANDROID_SDKS=android-21,sysimg-21 ANDROID_TARGET=android-21 ANDROID_ABI=x86 before_install: - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI diff --git a/app/build.gradle b/app/build.gradle index 370d901..14d485b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,10 +5,12 @@ buildscript { mavenCentral() } dependencies { + classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } +apply plugin: 'android-sdk-manager' apply plugin: 'com.android.application' apply plugin: 'kotlin-android' diff --git a/build.gradle b/build.gradle index a735b89..a75fc81 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:0.14.+' + classpath 'com.android.tools.build:gradle:0.12.+' // 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 e3385c3..22421bf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Nov 09 21:59:44 EST 2014 +#Fri Nov 07 23:02:34 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-1.12-all.zip