diff options
| author | Nicole Borrelli <borrelli@google.com> | 2017-02-13 14:50:53 -0800 |
|---|---|---|
| committer | Nicole Borrelli <borrelli@google.com> | 2017-02-13 17:14:10 -0800 |
| commit | cfef23307173179c22d71c774c0ae7b3a61776b0 (patch) | |
| tree | 876932c39750f597c712892fcdfbff0f43ed1e21 | |
| parent | 29c609a65e2594ed8c33771ce357c3a6d4c2beb6 (diff) | |
| download | build-cfef23307173179c22d71c774c0ae7b3a61776b0.tar.gz | |
Add ability to use support library for vector drawables
- Add flag use_support_library_vector_drawables to add required line to build.gradle
- Update support library version to 25.1.1
Change-Id: Id1a60192411cc102566189878117a14b9e11836b
| -rw-r--r-- | templates/base-application/_MODULE_/build.gradle.ftl | 18 | ||||
| -rw-r--r-- | templates/include/common.ftl | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl index 11ce3bcb..cb0a5c42 100644 --- a/templates/base-application/_MODULE_/build.gradle.ftl +++ b/templates/base-application/_MODULE_/build.gradle.ftl @@ -37,15 +37,15 @@ 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:support-v4:25.1.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:support-v4:25.1.1" + compile "com.android.support:gridlayout-v7:25.1.1" + compile "com.android.support:cardview-v7:25.1.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:support-v4:25.1.1" + compile "com.android.support:support-v13:25.1.1" + compile "com.android.support:cardview-v7:25.1.1" </#if> </#if> @@ -76,6 +76,10 @@ android { defaultConfig { minSdkVersion ${min_sdk} targetSdkVersion ${compile_sdk} + +<#if sample.use_support_library_vector_drawables?has_content && sample.use_support_library_vector_drawables == "true"> + vectorDrawables.useSupportLibrary = true +</#if> } compileOptions { diff --git a/templates/include/common.ftl b/templates/include/common.ftl index 7e2c6e6b..57fc0a28 100644 --- a/templates/include/common.ftl +++ b/templates/include/common.ftl @@ -83,7 +83,7 @@ <#assign play_services_version="10.0.1"/> <#assign play_services_wearable_dependency="'com.google.android.gms:play-services-wearable:${play_services_version}'"/> -<#assign android_support_v13_dependency="'com.android.support:support-v13:25.0.1'"/> +<#assign android_support_v13_dependency="'com.android.support:support-v13:25.1.1'"/> <#assign wearable_support_dependency="'com.google.android.support:wearable:2.0.0'"/> |