Updates all templates to use the latest version of gradle and adds support for multiDexEnabled, specifying compile version, and updates repositories code.

am: 134b52aa14

Change-Id: I3a3665b98d72512df7430d5135a85556016bc831

7 files changed, 102 insertions, 35 deletions

diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl
index 89a15b05..6f8161a3 100644
--- a/templates/Wear/Wearable/build.gradle.ftl
+++ b/templates/Wear/Wearable/build.gradle.ftl
@@ -19,18 +19,25 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.application'
 
-<#if sample.repository?has_content>
 repositories {
-<#list sample.repository as rep>
+    jcenter()
+    maven {
+        url 'https://maven.google.com'
+    }
+<#if sample.repository?has_content>
+  <#list sample.repository as rep>
     ${rep}
-</#list>
-}</#if>
+  </#list>
+</#if>
+}
+
+
 
 dependencies {
 
@@ -70,7 +77,12 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion ${compile_sdk}
+
+      <#if sample.compileSdkVersionWear?? && sample.compileSdkVersionWear?has_content>
+        compileSdkVersion ${sample.compileSdkVersionWear}
+      <#else>
+        compileSdkVersion ${compile_sdk}
+      </#if>
 
     buildToolsVersion ${build_tools_version}
 
@@ -89,6 +101,11 @@ android {
       <#else>
         targetSdkVersion ${compile_sdk}
       </#if>
+
+      <#if sample.multiDexEnabled?? && sample.multiDexEnabled?has_content>
+        multiDexEnabled ${sample.multiDexEnabled}
+      </#if>
+
     }
 
     compileOptions {
diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl
index 2ac52883..4fd221b9 100644
--- a/templates/WearPlusShared/Shared/build.gradle.ftl
+++ b/templates/WearPlusShared/Shared/build.gradle.ftl
@@ -19,7 +19,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
@@ -27,6 +27,14 @@ apply plugin: 'android-library'
 
 repositories {
     jcenter()
+    maven {
+        url 'https://maven.google.com'
+    }
+<#if sample.repository?has_content>
+    <#list sample.repository as rep>
+    ${rep}
+    </#list>
+</#if>
 }
 
 <#if sample.dependency_shared?has_content>
@@ -47,7 +55,11 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion ${compile_sdk}
+     <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
+        compileSdkVersion ${sample.compileSdkVersion}
+      <#else>
+        compileSdkVersion ${compile_sdk}
+      </#if>
 
     buildToolsVersion ${build_tools_version}
 
diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl
index 0034180c..21556857 100644
--- a/templates/WearPlusShared/Wearable/build.gradle.ftl
+++ b/templates/WearPlusShared/Wearable/build.gradle.ftl
@@ -19,21 +19,22 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.application'
 
-<#if sample.repository?has_content>
-repositories {
-<#list sample.repository as rep>
-    ${rep}
-</#list>
-}</#if>
-
 repositories {
     jcenter()
+    maven {
+        url 'https://maven.google.com'
+    }
+<#if sample.repository?has_content>
+    <#list sample.repository as rep>
+    ${rep}
+    </#list>
+</#if>
 }
 
 dependencies {
@@ -69,7 +70,12 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion ${compile_sdk}
+
+      <#if sample.compileSdkVersionWear?? && sample.compileSdkVersionWear?has_content>
+        compileSdkVersion ${sample.compileSdkVersionWear}
+      <#else>
+        compileSdkVersion ${compile_sdk}
+      </#if>
 
     buildToolsVersion ${build_tools_version}
 
@@ -77,12 +83,22 @@ android {
         versionCode 1
         versionName "1.0"
 
+      <#if sample.minSdkVersionWear?? && sample.minSdkVersionWear?has_content>
+        minSdkVersion ${sample.minSdkVersionWear}
+      <#else>
+        minSdkVersion ${min_sdk}
+      </#if>
+
       <#if sample.targetSdkVersionWear?? && sample.targetSdkVersionWear?has_content>
         targetSdkVersion ${sample.targetSdkVersionWear}
       <#else>
         targetSdkVersion ${compile_sdk}
       </#if>
 
+       <#if sample.multiDexEnabled?? && sample.multiDexEnabled?has_content>
+         multiDexEnabled ${sample.multiDexEnabled}
+       </#if>
+
     }
 
     compileOptions {
diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
index c9774110..73ba9f2e 100644
--- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl
+++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
@@ -19,22 +19,22 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.application'
 
-<#if sample.repository?has_content>
 repositories {
-<#list sample.repository as rep>
+    jcenter()
+    maven {
+        url 'https://maven.google.com'
+    }
+<#if sample.repository?has_content>
+    <#list sample.repository as rep>
     ${rep}
-</#list>
-}
+    </#list>
 </#if>
-
-repositories {
-    jcenter()
 }
 
 dependencies {
@@ -61,7 +61,11 @@ List<String> dirs = [
     'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion ${compile_sdk}
+     <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
+        compileSdkVersion ${sample.compileSdkVersion}
+      <#else>
+        compileSdkVersion ${compile_sdk}
+      </#if>
 
     buildToolsVersion ${build_tools_version}
 
diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl
index 820492ea..d3b21ae3 100644
--- a/templates/base-application/_MODULE_/build.gradle.ftl
+++ b/templates/base-application/_MODULE_/build.gradle.ftl
@@ -19,19 +19,23 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.application'
 
-<#if sample.repository?has_content>
 repositories {
-<#list sample.repository as rep>
+    jcenter()
+    maven {
+        url 'https://maven.google.com'
+    }
+<#if sample.repository?has_content>
+    <#list sample.repository as rep>
     ${rep}
-</#list>
-}
+    </#list>
 </#if>
+}
 
 dependencies {
 
@@ -70,7 +74,12 @@ List<String> dirs = [
 android {
      <#-- Note that target SDK is hardcoded in this template. We expect all samples
           to always use the most current SDK as their target. -->
-    compileSdkVersion ${compile_sdk}
+     <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
+        compileSdkVersion ${sample.compileSdkVersion}
+      <#else>
+        compileSdkVersion ${compile_sdk}
+      </#if>
+
     buildToolsVersion ${build_tools_version}
 
     defaultConfig {
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index 78b6a364..24b9cdb3 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -19,7 +19,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
@@ -27,6 +27,9 @@ apply plugin: 'com.android.application'
 
 repositories {
     jcenter()
+    maven {
+        url 'https://maven.google.com'
+    }
 <#if sample.repository?has_content>
 <#list sample.repository as rep>
     ${rep}
@@ -77,7 +80,13 @@ List<String> dirs = [
 android {
      <#-- Note that target SDK is hardcoded in this template. We expect all samples
           to always use the most current SDK as their target. -->
-    compileSdkVersion ${compile_sdk}
+    
+     <#if sample.compileSdkVersion?? && sample.compileSdkVersion?has_content>
+        compileSdkVersion ${sample.compileSdkVersion}
+      <#else>
+        compileSdkVersion ${compile_sdk}
+      </#if>
+
     buildToolsVersion ${build_tools_version}
 
     defaultConfig {
diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl
index 5fa31f7b..25f1e1cf 100644
--- a/templates/create/_MODULE_/build.gradle.ftl
+++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -25,7 +25,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }