commit d6c248558a9175b17d126e35a47351fa9d54e628
author Jan-Felix Schmakeit <jfschmakeit@google.com> Wed Jan 29 15:04:52 2014 +1100
committer Alexander Lucas <alexlucas@google.com> Tue Mar 04 15:03:19 2014 -0800
tree d0f333a1569f8d1b47178bfcd29797fb40678df2
parent bf91ce9f8c397d616be67d1f4c787e56dbe7826a

Update build tools to 0.8 and Gradle wrapper to 1.10.

Change-Id: I65277b5976ba3c34b5fde78895aa09c8e19e7b13

Conflicts:
	templates/base/_MODULE_/build.gradle.ftl

templates/base/_MODULE_/build.gradle.ftl

diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index 8c7ced1..4c73dd5 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -19,23 +19,25 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
+        classpath 'com.android.tools.build:gradle:0.8.+'
     }
 }
 
 apply plugin: 'android'
 
 dependencies {
+
 <#if !sample.auto_add_support_lib?has_content || sample.auto_add_support_lib == "true">
   // Add the support lib that is appropriate for SDK ${sample.minSdk}
   <#if sample.minSdk?number < 7>
-    compile "com.android.support:support-v4:18.0.+"
+    compile "com.android.support:support-v4:19.0.+"
   <#elseif sample.minSdk?number < 13>
-    compile "com.android.support:support-v4:18.0.+"
-    compile "com.android.support:gridlayout-v7:18.0.+"
+    compile "com.android.support:support-v4:19.0.+"
+    compile "com.android.support:gridlayout-v7:19.0.+"
   <#else>
-    compile "com.android.support:support-v13:18.0.+"
+    compile "com.android.support:support-v13:19.0.+"
   </#if>
+
 </#if>
 
 <#list sample.dependency as dep>
@@ -55,7 +57,8 @@
      <#-- Note that target SDK is hardcoded in this template. We expect all samples
           to always use the most current SDK as their target. -->
     compileSdkVersion ${compile_sdk}
-    buildToolsVersion "19"
+
+    buildToolsVersion "19.0.1"
 
     sourceSets {
         main {

templates/create/gradle/wrapper/gradle-wrapper.properties

diff --git a/templates/create/gradle/wrapper/gradle-wrapper.properties b/templates/create/gradle/wrapper/gradle-wrapper.properties
index 861eddc..56f685a 100644
--- a/templates/create/gradle/wrapper/gradle-wrapper.properties
+++ b/templates/create/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

templates/include/common.ftl

diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 59f6410..0cc5add 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -44,4 +44,4 @@
 
 
 <#-- Set the global build tools version -->
-<#assign build_tools_version='"18.1"'/>
+<#assign build_tools_version='"19.0.1"'/>