From 7b4edc8c65af8fb52af846f6a84714a59c9aa0fe Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Mon, 24 Nov 2014 00:09:15 -0500 Subject: [PATCH] Revert "More modifications for SDK 21 build" This reverts commit 61dc8fec9dccf7da4a25efb2a6b1ed8819f271cc. --- .travis.yml | 3 +-- build.gradle | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 641d663..6c270ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ language: android android: components: - build-tools-21.1.1 - - android-21 - - extra-android-support + # Don't have any other tools so far, robolectric covers pretty much everything... script: - ./gradlew test diff --git a/build.gradle b/build.gradle index 36cb58b..4e512fd 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,6 @@ buildscript { mavenCentral() } dependencies { - // Version lock the gradle plugin because Kotlin only works with up to 14.2 - // KT-6181 is open to track this issue classpath 'com.android.tools.build:gradle:0.14.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong