Fix up library dependencies for wear samples
Use the main sdk version, update wearable support to 1.1,
and support lib to 21. Use common template variables.
Change-Id: I886f8dfabc28be6c41c0b2f7fac2f7b5e4b719ce
diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl
index 4c7f79d..90e57fb 100644
--- a/templates/Wear/Wearable/build.gradle.ftl
+++ b/templates/Wear/Wearable/build.gradle.ftl
@@ -33,9 +33,9 @@
}</#if>
dependencies {
- compile 'com.google.android.gms:play-services-wearable:5.0.+'
- compile 'com.android.support:support-v13:20.0.+'
- compile 'com.google.android.support:wearable:1.0.+'
+ compile ${play_services_wearable_dependency}
+ compile ${android_support_v13_dependency}
+ compile ${wearable_support_dependency}
}
// The sample build uses multiple directories to
@@ -47,11 +47,9 @@
'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. -->
- compileSdkVersion 'android-20'
+ compileSdkVersion ${compile_sdk}
- buildToolsVersion ${build_tools_version}
+ buildToolsVersion ${build_tools_version}
buildTypes {
release {
diff --git a/templates/Wear/_MODULE_/build.gradle.ftl b/templates/Wear/_MODULE_/build.gradle.ftl
index b67c840..58d5706 100644
--- a/templates/Wear/_MODULE_/build.gradle.ftl
+++ b/templates/Wear/_MODULE_/build.gradle.ftl
@@ -42,11 +42,9 @@
compile files(${dep})
</#list>
- <#-- TODO: use sample variables to set these dependencies -->
- compile 'com.google.android.gms:play-services:5.0.+'
- compile 'com.android.support:support-v13:20.0.+'
+ compile ${play_services_dependency}
+ compile ${android_support_v13_dependency}
wearApp project(':Wearable')
-
}
// The sample build uses multiple directories to
@@ -60,7 +58,7 @@
android {
compileSdkVersion ${compile_sdk}
- buildToolsVersion ${build_tools_version}
+ buildToolsVersion ${build_tools_version}
defaultConfig {
minSdkVersion ${min_sdk}
diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl
index 9d5e026..8c742d9 100644
--- a/templates/WearPlusShared/Shared/build.gradle.ftl
+++ b/templates/WearPlusShared/Shared/build.gradle.ftl
@@ -34,11 +34,9 @@
'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. -->
compileSdkVersion ${compile_sdk}
- buildToolsVersion ${build_tools_version}
+ buildToolsVersion ${build_tools_version}
sourceSets {
main {
diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl
index 58dc384..014e394 100644
--- a/templates/WearPlusShared/Wearable/build.gradle.ftl
+++ b/templates/WearPlusShared/Wearable/build.gradle.ftl
@@ -33,9 +33,9 @@
}</#if>
dependencies {
- compile 'com.google.android.gms:play-services-wearable:5.0.+'
- compile 'com.android.support:support-v13:20.0.+'
- compile 'com.google.android.support:wearable:1.0.+'
+ compile ${play_services_wearable_dependency}
+ compile ${android_support_v13_dependency}
+ compile ${wearable_support_dependency}
compile project(':Shared')
}
@@ -48,9 +48,7 @@
'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. -->
- compileSdkVersion 'android-20'
+ compileSdkVersion ${compile_sdk}
buildToolsVersion ${build_tools_version}
diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
index 1ac578d..119e7d0 100644
--- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl
+++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
@@ -42,12 +42,10 @@
compile files(${dep})
</#list>
- <#-- TODO: use sample variables to set these dependencies -->
- compile 'com.google.android.gms:play-services:5.0.+'
- compile 'com.android.support:support-v13:20.0.+'
+ compile ${play_services_dependency}
+ compile ${android_support_v13_dependency}
compile project(':Shared')
wearApp project(':Wearable')
-
}
// The sample build uses multiple directories to
@@ -61,7 +59,7 @@
android {
compileSdkVersion ${compile_sdk}
- buildToolsVersion ${build_tools_version}
+ buildToolsVersion ${build_tools_version}
defaultConfig {
minSdkVersion ${min_sdk}
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 44398eb..65d8144 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -64,3 +64,10 @@
</#if>
<#-- Set the global build tools version -->
<#assign build_tools_version='"21.0.0"'/>
+
+<#assign play_services_dependency="'com.google.android.gms:play-services:6.5.+'"/>
+<#assign play_services_wearable_dependency="'com.google.android.gms:play-services-wearable:6.5.+'"/>
+
+<#assign android_support_v13_dependency="'com.android.support:support-v13:21.0.+'"/>
+
+<#assign wearable_support_dependency="'com.google.android.support:wearable:1.1.+'"/>
\ No newline at end of file
