diff options
author | Jeremy Walker <jewalker@google.com> | 2018-01-18 15:22:56 -0800 |
---|---|---|
committer | Jeremy Walker <jewalker@google.com> | 2018-01-24 15:33:24 -0800 |
commit | cd94b83113871d35826e7b0460e67c3d9af08205 (patch) | |
tree | b4f6e029bd23c413f10a7fc79eed5a6480acbfa1 /templates/base/_MODULE_/build.gradle.ftl | |
parent | d17d1feedff6eac10139a02df94b8102aa99460a (diff) | |
download | build-cd94b83113871d35826e7b0460e67c3d9af08205.tar.gz |
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
Diffstat (limited to 'templates/base/_MODULE_/build.gradle.ftl')
-rw-r--r-- | templates/base/_MODULE_/build.gradle.ftl | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl index e8114884..625ba557 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 @@ apply plugin: 'com.android.application' repositories { jcenter() - maven { - url 'https://maven.google.com' - } + google() <#if sample.repository?has_content> <#list sample.repository as rep> ${rep} @@ -81,14 +77,13 @@ List<String> dirs = [ '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} |