Wearable support lib 2.2 and swap in google() plus minor spacing fix.
Bug: 72318935
Test: Manually tested with all Wear sample apps.
Change-Id: Ifd4815212d1173a21ab82a34b95dd609f05dc922
diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl
index 74a3c5a..551b45d 100644
--- a/templates/Wear/Wearable/build.gradle.ftl
+++ b/templates/Wear/Wearable/build.gradle.ftl
@@ -15,10 +15,8 @@
-->
buildscript {
repositories {
- maven {
- url 'https://maven.google.com'
- }
jcenter()
+ google()
}
dependencies {
@@ -30,9 +28,7 @@
repositories {
jcenter()
- maven {
- url 'https://maven.google.com'
- }
+ google()
<#if sample.repository?has_content>
<#list sample.repository as rep>
${rep}
@@ -81,11 +77,11 @@
android {
- <#if sample.compileSdkVersionWear?? && sample.compileSdkVersionWear?has_content>
- compileSdkVersion ${sample.compileSdkVersionWear}
- <#else>
- compileSdkVersion ${compile_sdk}
- </#if>
+ <#if sample.compileSdkVersionWear?? && sample.compileSdkVersionWear?has_content>
+ compileSdkVersion ${sample.compileSdkVersionWear}
+ <#else>
+ compileSdkVersion ${compile_sdk}
+ </#if>
buildToolsVersion ${build_tools_version}
diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl
index e7f626a..d7f060a 100644
--- a/templates/WearPlusShared/Shared/build.gradle.ftl
+++ b/templates/WearPlusShared/Shared/build.gradle.ftl
@@ -15,10 +15,8 @@
-->
buildscript {
repositories {
- maven {
- url 'https://maven.google.com'
- }
jcenter()
+ google()
}
dependencies {
@@ -30,9 +28,7 @@
repositories {
jcenter()
- maven {
- url 'https://maven.google.com'
- }
+ google()
<#if sample.repository?has_content>
<#list sample.repository as rep>
${rep}
@@ -58,11 +54,11 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
- compileSdkVersion ${sample.compileSdkVersion}
- <#else>
- compileSdkVersion ${compile_sdk}
- </#if>
+ <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
+ compileSdkVersion ${sample.compileSdkVersion}
+ <#else>
+ compileSdkVersion ${compile_sdk}
+ </#if>
buildToolsVersion ${build_tools_version}
diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl
index 184fcc6..841ef6f 100644
--- a/templates/WearPlusShared/Wearable/build.gradle.ftl
+++ b/templates/WearPlusShared/Wearable/build.gradle.ftl
@@ -15,10 +15,8 @@
-->
buildscript {
repositories {
- maven {
- url 'https://maven.google.com'
- }
jcenter()
+ google()
}
dependencies {
@@ -30,9 +28,7 @@
repositories {
jcenter()
- maven {
- url 'https://maven.google.com'
- }
+ google()
<#if sample.repository?has_content>
<#list sample.repository as rep>
${rep}
@@ -74,11 +70,11 @@
android {
- <#if sample.compileSdkVersionWear?? && sample.compileSdkVersionWear?has_content>
- compileSdkVersion ${sample.compileSdkVersionWear}
- <#else>
- compileSdkVersion ${compile_sdk}
- </#if>
+ <#if sample.compileSdkVersionWear?? && sample.compileSdkVersionWear?has_content>
+ compileSdkVersion ${sample.compileSdkVersionWear}
+ <#else>
+ compileSdkVersion ${compile_sdk}
+ </#if>
buildToolsVersion ${build_tools_version}
diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
index f3adf41..e87a32d 100644
--- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl
+++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
@@ -15,10 +15,8 @@
-->
buildscript {
repositories {
- maven {
- url 'https://maven.google.com'
- }
jcenter()
+ google()
}
dependencies {
@@ -30,9 +28,7 @@
repositories {
jcenter()
- maven {
- url 'https://maven.google.com'
- }
+ google()
<#if sample.repository?has_content>
<#list sample.repository as rep>
${rep}
@@ -64,11 +60,11 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
- compileSdkVersion ${sample.compileSdkVersion}
- <#else>
- compileSdkVersion ${compile_sdk}
- </#if>
+ <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
+ compileSdkVersion ${sample.compileSdkVersion}
+ <#else>
+ compileSdkVersion ${compile_sdk}
+ </#if>
buildToolsVersion ${build_tools_version}
diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl
index 02b30c1..bbef85d 100644
--- a/templates/base-application/_MODULE_/build.gradle.ftl
+++ b/templates/base-application/_MODULE_/build.gradle.ftl
@@ -16,9 +16,7 @@
buildscript {
repositories {
jcenter()
- maven {
- url 'https://maven.google.com'
- }
+ google()
}
dependencies {
@@ -30,9 +28,7 @@
repositories {
jcenter()
- maven {
- url 'https://maven.google.com'
- }
+ google()
<#if sample.repository?has_content>
<#list sample.repository as rep>
${rep}
@@ -75,13 +71,13 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- <#-- Note that target SDK is hardcoded in this template. We expect all samples
- to always use the most current SDK as their target. -->
- <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
- compileSdkVersion ${sample.compileSdkVersion}
- <#else>
- compileSdkVersion ${compile_sdk}
- </#if>
+ <#-- Note that target SDK is hardcoded in this template. We expect all samples
+ to always use the most current SDK as their target. -->
+ <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
+ compileSdkVersion ${sample.compileSdkVersion}
+ <#else>
+ compileSdkVersion ${compile_sdk}
+ </#if>
buildToolsVersion ${build_tools_version}
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index e811488..625ba55 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -15,10 +15,8 @@
-->
buildscript {
repositories {
- maven {
- url 'https://maven.google.com'
- }
jcenter()
+ google()
}
dependencies {
@@ -30,9 +28,7 @@
repositories {
jcenter()
- maven {
- url 'https://maven.google.com'
- }
+ google()
<#if sample.repository?has_content>
<#list sample.repository as rep>
${rep}
@@ -81,14 +77,13 @@
'template'] // boilerplate code that is generated by the sample template process
android {
- <#-- Note that target SDK is hardcoded in this template. We expect all samples
- to always use the most current SDK as their target. -->
-
- <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
- compileSdkVersion ${sample.compileSdkVersion}
- <#else>
- compileSdkVersion ${compile_sdk}
- </#if>
+ <#-- Note that target SDK is hardcoded in this template. We expect all samples
+ to always use the most current SDK as their target. -->
+ <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
+ compileSdkVersion ${sample.compileSdkVersion}
+ <#else>
+ compileSdkVersion ${compile_sdk}
+ </#if>
buildToolsVersion ${build_tools_version}
diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl
index ee05da8..d17c05a 100644
--- a/templates/create/_MODULE_/build.gradle.ftl
+++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -21,10 +21,8 @@
buildscript {
repositories {
- maven {
- url 'https://maven.google.com'
- }
jcenter()
+ google()
}
dependencies {
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 468da21..a665e16 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:27.0.2'"/>
-<#assign wearable_support_dependency="'com.google.android.support:wearable:2.1.0'"/>
+<#assign wearable_support_dependency="'com.google.android.support:wearable:2.2.0'"/>
-<#assign wearable_support_provided_dependency="'com.google.android.wearable:wearable:2.1.0'"/>
+<#assign wearable_support_provided_dependency="'com.google.android.wearable:wearable:2.2.0'"/>
