| commit | 37357c71fac06713a039117788e03b10c7c4743c | [log] [tgz] |
|---|---|---|
| author | Alexander Lucas <alexlucas@google.com> | Mon Oct 28 15:02:43 2013 -0700 |
| committer | Alexander Lucas <alexlucas@google.com> | Mon Oct 28 15:07:34 2013 -0700 |
| tree | d1aebcd4fa31c42f04209a702a01e9c32e3d59a3 | |
| parent | fbdb4f403c1e7c73185a51fb3e99ff169b687656 [diff] |
Fixed issue with supplying numerical compileSdkVersion, test manifest outputting variable names instead of package names, updating build tools version. Change-Id: Ib5908299545580bfa1421519e635d221be69bc62
diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl index 2cb3c6a..e81142b 100644 --- a/templates/create/_MODULE_/build.gradle.ftl +++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -25,7 +25,7 @@ } dependencies { - classpath 'com.android.tools.build:gradle:0.5.+' + classpath 'com.android.tools.build:gradle:0.6.+' } }
diff --git a/templates/create/_MODULE_/tests/AndroidManifest.xml b/templates/create/_MODULE_/tests/AndroidManifest.xml.ftl similarity index 100% rename from templates/create/_MODULE_/tests/AndroidManifest.xml rename to templates/create/_MODULE_/tests/AndroidManifest.xml.ftl
diff --git a/templates/include/common.ftl b/templates/include/common.ftl index 2352fa9..15ce49d 100644 --- a/templates/include/common.ftl +++ b/templates/include/common.ftl
@@ -36,6 +36,8 @@ <#else> <#assign compile_sdk = sample.compileSdkVersion/> </#if> +<#elseif (sample.compileSdkVersion)?has_content> + <#assign compile_sdk = sample.compileSdkVersion/> <#else> <#assign compile_sdk = 18/> </#if>