diff options
| author | Josiah Gaskin <josiahgaskin@google.com> | 2015-10-19 23:14:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-19 23:14:07 +0000 |
| commit | f4369128a028f87f9e951f18a955ee0dbc3fcf9d (patch) | |
| tree | aa5557bb2a968a06cd73180bece99925ca802280 | |
| parent | 3c865681765e9e8ec498ed249d0fb7600a67dea4 (diff) | |
| parent | f908080572dd32aaacfbec2f24e098d90a7ba66b (diff) | |
| download | base-f4369128a028f87f9e951f18a955ee0dbc3fcf9d.tar.gz | |
Merge "Update New Project Template Dependencies"
am: f908080572
* commit 'f908080572dd32aaacfbec2f24e098d90a7ba66b':
Update New Project Template Dependencies
4 files changed, 8 insertions, 4 deletions
diff --git a/templates/gradle-projects/NewAndroidApplication/root/build.gradle.ftl b/templates/gradle-projects/NewAndroidApplication/root/build.gradle.ftl index 5196c75463..472dd14d9f 100644 --- a/templates/gradle-projects/NewAndroidApplication/root/build.gradle.ftl +++ b/templates/gradle-projects/NewAndroidApplication/root/build.gradle.ftl @@ -31,5 +31,7 @@ android { } dependencies { - compile 'com.android.support:support-v4:${v4SupportLibraryVersion}' +<#if androidSupportLibraryUrl??> + compile '${androidSupportLibraryUrl}' +</#if> } diff --git a/templates/gradle-projects/NewAndroidApplication/template.xml b/templates/gradle-projects/NewAndroidApplication/template.xml index 0d9b234317..a5a8da27a6 100644 --- a/templates/gradle-projects/NewAndroidApplication/template.xml +++ b/templates/gradle-projects/NewAndroidApplication/template.xml @@ -4,7 +4,7 @@ revision="2" name="Android Application" description="Creates a new Android application."> - <dependency name="android-support-v4" revision="8" /> + <dependency name="android-support" /> <thumbs> <thumb>template_new_project.png</thumb> diff --git a/templates/gradle-projects/NewAndroidLibrary/root/build.gradle.ftl b/templates/gradle-projects/NewAndroidLibrary/root/build.gradle.ftl index 5c6994ec56..752943abad 100644 --- a/templates/gradle-projects/NewAndroidLibrary/root/build.gradle.ftl +++ b/templates/gradle-projects/NewAndroidLibrary/root/build.gradle.ftl @@ -31,5 +31,7 @@ android { } dependencies { - compile 'com.android.support:support-v4:${v4SupportLibraryVersion}' +<#if androidSupportLibraryUrl??> + compile '${androidSupportLibraryUrl}' +</#if> } diff --git a/templates/gradle-projects/NewAndroidLibrary/template.xml b/templates/gradle-projects/NewAndroidLibrary/template.xml index 9d13db54b4..a25cf02ddf 100644 --- a/templates/gradle-projects/NewAndroidLibrary/template.xml +++ b/templates/gradle-projects/NewAndroidLibrary/template.xml @@ -4,7 +4,7 @@ revision="2" name="Android Library" description="Creates a new Android library."> - <dependency name="android-support-v4" revision="8" /> + <dependency name="android-support" /> <thumbs> <thumb>template_new_project.png</thumb> |