From ea228fb496075a2254227611024bf9902e1852f4 Mon Sep 17 00:00:00 2001 From: keyboardsurfer Date: Tue, 24 Jun 2014 02:23:58 +0200 Subject: [PATCH] gradle plugin 0.11.1, gradle version 1.12, build tools 19.1.0 --- build.gradle | 4 ++-- library/build.gradle | 6 +++--- sample/build.gradle | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 09ebd63..bfed88c 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ version = '1.8.4' } dependencies { - classpath 'com.android.tools.build:gradle:0.9.+' + classpath 'com.android.tools.build:gradle:0.11.1' classpath 'com.github.dcendents:android-maven-plugin:1.0' } } @@ -37,5 +37,5 @@ version = '1.8.4' task wrapper(type: Wrapper) { description "Generates the gradle wrapper" - gradleVersion = "1.11" + gradleVersion = "1.12" } diff --git a/library/build.gradle b/library/build.gradle index 328a1d7..03a099c 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -22,7 +22,7 @@ dependencies { } android { - buildToolsVersion '19.0.3' + buildToolsVersion '19.1.0' compileSdkVersion 19 defaultConfig { versionCode 7 @@ -42,13 +42,13 @@ artifactId = "crouton" android.libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.BuilderConstants.DEBUG)) { + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { return; // Skip debug builds. } task("javadoc${variant.name.capitalize()}", type: Javadoc) { description "Generates Javadoc for $variant.name." source = variant.javaCompile.source - ext.androidJar = "${android.plugin.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" + ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar) } diff --git a/sample/build.gradle b/sample/build.gradle index b1446f8..5f34140 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -40,7 +40,7 @@ dependencies { } android { - buildToolsVersion '19.0.3' + buildToolsVersion '19.1.0' compileSdkVersion 19 defaultConfig {