From 6e3f2739c3e40207bcb914f179da26cf96f24b7f Mon Sep 17 00:00:00 2001 From: Jeremy Walker Date: Fri, 2 Jun 2017 11:50:29 -0700 Subject: Update support librarys and gradle to latest versions. Bug: 62249372 Change-Id: I5c10e177305e620e46d6a317b5883048bb90b1fd Test: Script changed versioning, manually tested all Wear samples impacted by change. --- templates/Wear/Wearable/build.gradle.ftl | 2 +- templates/WearPlusShared/Shared/build.gradle.ftl | 2 +- templates/WearPlusShared/Wearable/build.gradle.ftl | 2 +- templates/WearPlusShared/_MODULE_/build.gradle.ftl | 2 +- .../base-application/_MODULE_/build.gradle.ftl | 2 +- templates/base/_MODULE_/build.gradle.ftl | 22 +++++++++++----------- templates/create/_MODULE_/build.gradle.ftl | 2 +- templates/include/common.ftl | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'templates') diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl index 6d8a4b71..89a15b05 100644 --- a/templates/Wear/Wearable/build.gradle.ftl +++ b/templates/Wear/Wearable/build.gradle.ftl @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.2' } } diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl index 991f0d9d..2ac52883 100644 --- a/templates/WearPlusShared/Shared/build.gradle.ftl +++ b/templates/WearPlusShared/Shared/build.gradle.ftl @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.2' } } diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl index 23894159..0034180c 100644 --- a/templates/WearPlusShared/Wearable/build.gradle.ftl +++ b/templates/WearPlusShared/Wearable/build.gradle.ftl @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.2' } } diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl index eceb8e1b..c9774110 100644 --- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl +++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.2' } } diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl index a6f84696..820492ea 100644 --- a/templates/base-application/_MODULE_/build.gradle.ftl +++ b/templates/base-application/_MODULE_/build.gradle.ftl @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.2' } } diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl index 86b8f26c..78b6a364 100644 --- a/templates/base/_MODULE_/build.gradle.ftl +++ b/templates/base/_MODULE_/build.gradle.ftl @@ -19,7 +19,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.3.2' } } @@ -37,18 +37,18 @@ repositories { dependencies { <#if !sample.auto_add_support_lib?has_content || sample.auto_add_support_lib == "true"> <#if sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 7> - compile "com.android.support:support-v4:25.0.1" - compile "com.android.support:appcompat-v7:25.0.1" + compile "com.android.support:support-v4:25.3.1" + compile "com.android.support:appcompat-v7:25.3.1" <#elseif sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 13> - compile "com.android.support:support-v4:25.0.1" - compile "com.android.support:gridlayout-v7:25.0.1" - compile "com.android.support:cardview-v7:25.0.1" - compile "com.android.support:appcompat-v7:25.0.1" + compile "com.android.support:support-v4:25.3.1" + compile "com.android.support:gridlayout-v7:25.3.1" + compile "com.android.support:cardview-v7:25.3.1" + compile "com.android.support:appcompat-v7:25.3.1" <#else> - compile "com.android.support:support-v4:25.0.1" - compile "com.android.support:support-v13:25.0.1" - compile "com.android.support:cardview-v7:25.0.1" - compile "com.android.support:appcompat-v7:25.0.1" + compile "com.android.support:support-v4:25.3.1" + compile "com.android.support:support-v13:25.3.1" + compile "com.android.support:cardview-v7:25.3.1" + compile "com.android.support:appcompat-v7:25.3.1" <#list sample.dependency as dep> diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl index 4cb8bad1..5fa31f7b 100644 --- a/templates/create/_MODULE_/build.gradle.ftl +++ b/templates/create/_MODULE_/build.gradle.ftl @@ -25,7 +25,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:2.3.2' } } diff --git a/templates/include/common.ftl b/templates/include/common.ftl index 7446b15e..a2888714 100644 --- a/templates/include/common.ftl +++ b/templates/include/common.ftl @@ -85,6 +85,6 @@ <#assign android_support_v13_dependency="'com.android.support:support-v13:25.3.1'"/> -<#assign wearable_support_dependency="'com.google.android.support:wearable:2.0.1'"/> +<#assign wearable_support_dependency="'com.google.android.support:wearable:2.0.3'"/> -<#assign wearable_support_provided_dependency="'com.google.android.wearable:wearable:2.0.1'"/> +<#assign wearable_support_provided_dependency="'com.google.android.wearable:wearable:2.0.3'"/> -- cgit v1.2.3