Revert "More modifications for SDK 21 build"

This reverts commit 61dc8fec9d.
This commit is contained in:
Bradlee Speice 2014-11-24 00:09:15 -05:00
parent f25b436ca3
commit 7b4edc8c65
2 changed files with 1 additions and 4 deletions

View File

@ -3,8 +3,7 @@ language: android
android: android:
components: components:
- build-tools-21.1.1 - build-tools-21.1.1
- android-21 # Don't have any other tools so far, robolectric covers pretty much everything...
- extra-android-support
script: script:
- ./gradlew test - ./gradlew test

View File

@ -7,8 +7,6 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { 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 'com.android.tools.build:gradle:0.14.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong