Merge "Templates: Make sure resources are unique" into developers-dev
diff --git a/build.gradle b/build.gradle
index 9523a99..d643cd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -129,9 +129,11 @@
// Paths to exclude from output
exclude ".gradle"
exclude "_index.jd"
+ exclude "bin"
exclude "buildSrc"
exclude "local.properties"
exclude "template-params.xml"
+ exclude "*.iml"
exclude "**/build"
exclude "**/proguard-project.txt"
exclude "${samplegen.targetSampleModule()}/**/README*.txt"
diff --git a/templates/base/README.txt b/templates/base/README.txt
index 3f034f4..9616c58 100644
--- a/templates/base/README.txt
+++ b/templates/base/README.txt
@@ -1,6 +1,18 @@
Build Instructions
-------------------
+
This sample uses the Gradle build system. To build this project, use the
"gradlew build" command or use "Import Project" in Android Studio.
-To see a list of all available commands, run "gradlew tasks".
\ No newline at end of file
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+ http://developer.android.com/sdk/installing/studio.html
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 15ce49d..59f6410 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -39,9 +39,9 @@
<#elseif (sample.compileSdkVersion)?has_content>
<#assign compile_sdk = sample.compileSdkVersion/>
<#else>
- <#assign compile_sdk = 18/>
+ <#assign compile_sdk = 19/>
</#if>
<#-- Set the global build tools version -->
-<#assign build_tools_version='"18.0.1"'/>
+<#assign build_tools_version='"18.1"'/>