diff options
| author | Trevor Johns <trevor@sparkledog.net> | 2014-08-10 14:47:23 -0700 |
|---|---|---|
| committer | Trevor Johns <trevor@sparkledog.net> | 2014-08-10 14:47:23 -0700 |
| commit | 9c0c6f4c7fc61142c5ff77d40fc2ba449cac20f1 (patch) | |
| tree | 5f0fd0c1672c6a4691ffc7f3b10a6078f39e57ff | |
| parent | ad3248074b8e68945ff68664bbae0fa27156726c (diff) | |
| parent | e06894398fc6e6c45c0ed55430bfa12383437fb8 (diff) | |
| download | iosched-9c0c6f4c7fc61142c5ff77d40fc2ba449cac20f1.tar.gz | |
Merge pull request #17 from yelinaung/master
Change plugin to 'com.android.application' and bump build tools version
| -rw-r--r-- | Wearable/build.gradle | 4 | ||||
| -rw-r--r-- | android/build.gradle | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Wearable/build.gradle b/Wearable/build.gradle index 50264fc..7549abb 100644 --- a/Wearable/build.gradle +++ b/Wearable/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ -apply plugin: 'android' +apply plugin: 'com.android.application' repositories { mavenCentral() @@ -25,7 +25,7 @@ repositories { android { compileSdkVersion 20 - buildToolsVersion "19.1.0" + buildToolsVersion "20.0.0" defaultConfig { applicationId "com.google.samples.apps.iosched" diff --git a/android/build.gradle b/android/build.gradle index f7eb89f..b570079 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,7 +16,7 @@ lpreview = hasProperty('lpreview') -apply plugin: 'android' +apply plugin: 'com.android.application' repositories { mavenCentral() @@ -27,7 +27,7 @@ repositories { android { compileSdkVersion lpreview ? "android-L" : 19 - buildToolsVersion "19.1.0" + buildToolsVersion "20.0.0" productFlavors { lpreview ? lpreview{} : classic{} } |