From 4165756c603b78f63d6ea04e410be476db924b0d Mon Sep 17 00:00:00 2001 From: keyboardsurfer Date: Mon, 3 Feb 2014 17:24:27 +0100 Subject: [PATCH] gradle wrapper 1.10 and build tools 0.8+ --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 20 ++----------------- library/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 8305c71..0354356 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ subprojects { } dependencies { - classpath 'com.android.tools.build:gradle:0.7+' + classpath 'com.android.tools.build:gradle:0.8+' classpath 'com.github.dcendents:android-maven-plugin:1.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d0664af..926a47a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,22 +1,6 @@ -# -# Copyright 2012 - 2013 Benjamin Weiss -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#Fri Jan 10 13:11:21 CET 2014 +#Mon Feb 03 17:16:48 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip diff --git a/library/build.gradle b/library/build.gradle index e8e78bd..110e5cd 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -84,7 +84,7 @@ artifacts { task wrapper(type: Wrapper) { description "Generates the gradle wrapper" - gradleVersion = "1.9" + gradleVersion = "1.10" } diff --git a/library/gradle/wrapper/gradle-wrapper.properties b/library/gradle/wrapper/gradle-wrapper.properties index fde1aef..926a47a 100644 --- a/library/gradle/wrapper/gradle-wrapper.properties +++ b/library/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jan 06 11:20:11 CET 2014 +#Mon Feb 03 17:16:48 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip