diff options
| author | Jeremy Walker <jewalker@google.com> | 2017-02-06 18:32:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-06 18:32:32 +0000 |
| commit | a96627854aadb236c5f23b4d106e15bad8a1328c (patch) | |
| tree | e757b3960d265b11f661d58dd7c8f7f7b0fe2fb5 /templates | |
| parent | ac5c65ced43ddcda21154c0bb3dc772b5b095d67 (diff) | |
| parent | ffd9f6acffc0f4c9035b1dc5b75b30726f265b4e (diff) | |
| download | build-a96627854aadb236c5f23b4d106e15bad8a1328c.tar.gz | |
Updates support library for 2.0 launch and adds provided gradle requirement for all wear samples. am: 29c609a65e am: 0c9950dc3c am: ca3b068305
am: ffd9f6acff
Change-Id: I3ea1aeb28dc61e24e7c7d51b5c8c32bd80210206
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Wear/Wearable/build.gradle.ftl | 6 | ||||
| -rw-r--r-- | templates/WearPlusShared/Wearable/build.gradle.ftl | 6 | ||||
| -rw-r--r-- | templates/include/common.ftl | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl index c58aff92..7cb1de97 100644 --- a/templates/Wear/Wearable/build.gradle.ftl +++ b/templates/Wear/Wearable/build.gradle.ftl @@ -47,6 +47,12 @@ dependencies { compile ${play_services_wearable_dependency} compile ${android_support_v13_dependency} + <#if sample.preview_wearable_support_provided_dependency?? && sample.preview_wearable_support_provided_dependency?has_content> + provided '${sample.preview_wearable_support_provided_dependency}' + <#else> + provided ${wearable_support_provided_dependency} + </#if> + <#if sample.preview_wearable_support_dependency?? && sample.preview_wearable_support_dependency?has_content> compile '${sample.preview_wearable_support_dependency}' <#else> diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl index a2e70076..1b9f61ad 100644 --- a/templates/WearPlusShared/Wearable/build.gradle.ftl +++ b/templates/WearPlusShared/Wearable/build.gradle.ftl @@ -45,6 +45,12 @@ dependencies { compile ${play_services_wearable_dependency} compile ${android_support_v13_dependency} + <#if sample.preview_wearable_support_provided_dependency?? && sample.preview_wearable_support_provided_dependency?has_content> + provided '${sample.preview_wearable_support_provided_dependency}' + <#else> + provided ${wearable_support_provided_dependency} + </#if> + <#if sample.preview_wearable_support_dependency?? && sample.preview_wearable_support_dependency?has_content> compile '${sample.preview_wearable_support_dependency}' <#else> diff --git a/templates/include/common.ftl b/templates/include/common.ftl index d283a54a..7e2c6e6b 100644 --- a/templates/include/common.ftl +++ b/templates/include/common.ftl @@ -85,4 +85,6 @@ <#assign android_support_v13_dependency="'com.android.support:support-v13:25.0.1'"/> -<#assign wearable_support_dependency="'com.google.android.support:wearable:1.4.0'"/> +<#assign wearable_support_dependency="'com.google.android.support:wearable:2.0.0'"/> + +<#assign wearable_support_provided_dependency="'com.google.android.wearable:wearable:2.0.0'"/> |