From c36d2d7a5e5b27f7cfd6892109f9ceb5e49006df Mon Sep 17 00:00:00 2001 From: cketti Date: Sat, 26 Jul 2014 18:06:20 +0200 Subject: [PATCH] Use latest Gradle Android plugin and build tools --- build.gradle | 6 +++--- plugins/Android-PullToRefresh/library/build.gradle | 4 ++-- plugins/HoloColorPicker/build.gradle | 2 +- plugins/ckChangeLog/library/build.gradle | 4 ++-- plugins/openpgp-api-library/build.gradle | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 1b68ac21a..07d0e49b6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,11 +4,11 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.2' } } -apply plugin: 'android' +apply plugin: 'com.android.application' dependencies { compile project(':plugins:Android-PullToRefresh:library') @@ -21,7 +21,7 @@ dependencies { android { compileSdkVersion 19 - buildToolsVersion '19.1.0' + buildToolsVersion '20.0.0' sourceSets { main { diff --git a/plugins/Android-PullToRefresh/library/build.gradle b/plugins/Android-PullToRefresh/library/build.gradle index 46e878d7b..6d617a45f 100644 --- a/plugins/Android-PullToRefresh/library/build.gradle +++ b/plugins/Android-PullToRefresh/library/build.gradle @@ -1,8 +1,8 @@ -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { compileSdkVersion 19 - buildToolsVersion '19.1.0' + buildToolsVersion '20.0.0' sourceSets { main { diff --git a/plugins/HoloColorPicker/build.gradle b/plugins/HoloColorPicker/build.gradle index 03e52faa0..7c966604e 100644 --- a/plugins/HoloColorPicker/build.gradle +++ b/plugins/HoloColorPicker/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { compileSdkVersion 19 diff --git a/plugins/ckChangeLog/library/build.gradle b/plugins/ckChangeLog/library/build.gradle index d84407c25..b7eec9000 100644 --- a/plugins/ckChangeLog/library/build.gradle +++ b/plugins/ckChangeLog/library/build.gradle @@ -1,8 +1,8 @@ -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { compileSdkVersion 19 - buildToolsVersion '19.1.0' + buildToolsVersion '20.0.0' sourceSets { main { diff --git a/plugins/openpgp-api-library/build.gradle b/plugins/openpgp-api-library/build.gradle index 96caf2433..1c5461493 100644 --- a/plugins/openpgp-api-library/build.gradle +++ b/plugins/openpgp-api-library/build.gradle @@ -5,16 +5,16 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.11.+' + classpath 'com.android.tools.build:gradle:0.12.2' } } -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { - compileSdkVersion 17 - buildToolsVersion '19.1.0' - + compileSdkVersion 19 + buildToolsVersion '20.0.0' + // NOTE: We are using the old folder structure to also support Eclipse sourceSets { main {