diff options
| author | Scott Barta <sbarta@google.com> | 2013-07-02 23:17:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-02 23:17:06 +0000 |
| commit | 7112deae37930fd10f6d6b1426c62b9e21631615 (patch) | |
| tree | 02594173c333fb682cffb7b52ab63c1e2a35dea8 /templates | |
| parent | a0d49f94b7933af2e96aa2961589bc0b27541e5c (diff) | |
| parent | 8cd01808004369a5144d55e597d4a07b11c86b75 (diff) | |
| download | sdk-7112deae37930fd10f6d6b1426c62b9e21631615.zip sdk-7112deae37930fd10f6d6b1426c62b9e21631615.tar.gz sdk-7112deae37930fd10f6d6b1426c62b9e21631615.tar.bz2 | |
Merge "Fixes to Gradle plugin, support library versions"
Diffstat (limited to 'templates')
6 files changed, 26 insertions, 6 deletions
diff --git a/templates/projects/NewAndroidApplication/globals.xml.ftl b/templates/projects/NewAndroidApplication/globals.xml.ftl index 29bae5a..d196321 100644 --- a/templates/projects/NewAndroidApplication/globals.xml.ftl +++ b/templates/projects/NewAndroidApplication/globals.xml.ftl @@ -8,4 +8,6 @@ <global id="resOut" value="res" /> <global id="mavenUrl" value="mavenCentral" /> <global id="buildToolsVersion" value="${buildApi}" /> + <global id="gradlePluginVersion" value="1.0.+" /> + <global id="v4SupportLibraryVersion" value="13.0.+" /> </globals> diff --git a/templates/projects/NewAndroidApplication/root/build.gradle.ftl b/templates/projects/NewAndroidApplication/root/build.gradle.ftl index df1ab4a..83b4368 100644 --- a/templates/projects/NewAndroidApplication/root/build.gradle.ftl +++ b/templates/projects/NewAndroidApplication/root/build.gradle.ftl @@ -7,13 +7,21 @@ buildscript { </#if> } dependencies { - classpath 'com.android.tools.build:gradle:0.4' + classpath 'com.android.tools.build:gradle:${gradlePluginVersion}' } } apply plugin: 'android' +repositories { +<#if mavenUrl == "mavenCentral"> + mavenCentral() +<#else> + maven { url '${mavenUrl}' } +</#if> +} + dependencies { - compile files('libs/android-support-v4.jar') + compile 'com.android.support:support-v4:${v4SupportLibraryVersion}' } android { diff --git a/templates/projects/NewAndroidApplication/template.xml b/templates/projects/NewAndroidApplication/template.xml index a60cfc6..a5cefaf 100644 --- a/templates/projects/NewAndroidApplication/template.xml +++ b/templates/projects/NewAndroidApplication/template.xml @@ -16,7 +16,7 @@ id="packageName" name="Package name" type="string" - constraints="package" + constraints="package|nonempty" default="com.mycompany.myapp" /> <parameter diff --git a/templates/projects/NewAndroidLibrary/globals.xml.ftl b/templates/projects/NewAndroidLibrary/globals.xml.ftl index 29bae5a..d196321 100644 --- a/templates/projects/NewAndroidLibrary/globals.xml.ftl +++ b/templates/projects/NewAndroidLibrary/globals.xml.ftl @@ -8,4 +8,6 @@ <global id="resOut" value="res" /> <global id="mavenUrl" value="mavenCentral" /> <global id="buildToolsVersion" value="${buildApi}" /> + <global id="gradlePluginVersion" value="1.0.+" /> + <global id="v4SupportLibraryVersion" value="13.0.+" /> </globals> diff --git a/templates/projects/NewAndroidLibrary/root/build.gradle.ftl b/templates/projects/NewAndroidLibrary/root/build.gradle.ftl index 04f9cf4..1b7e780 100644 --- a/templates/projects/NewAndroidLibrary/root/build.gradle.ftl +++ b/templates/projects/NewAndroidLibrary/root/build.gradle.ftl @@ -7,13 +7,21 @@ buildscript { </#if> } dependencies { - classpath 'com.android.tools.build:gradle:0.4' + classpath 'com.android.tools.build:gradle:${gradlePluginVersion}' } } apply plugin: 'android-library' +repositories { +<#if mavenUrl == "mavenCentral"> + mavenCentral() +<#else> + maven { url '${mavenUrl}' } +</#if> +} + dependencies { - compile files('libs/android-support-v4.jar') + compile 'com.android.support:support-v4:${v4SupportLibraryVersion}' } android { diff --git a/templates/projects/NewAndroidLibrary/template.xml b/templates/projects/NewAndroidLibrary/template.xml index 463643d..537d745 100644 --- a/templates/projects/NewAndroidLibrary/template.xml +++ b/templates/projects/NewAndroidLibrary/template.xml @@ -16,7 +16,7 @@ id="packageName" name="Package name" type="string" - constraints="package" + constraints="package|nonempty" default="com.mycompany.myapp" /> <parameter |