summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJeremy Walker <jewalker@google.com>2017-11-06 14:00:10 -0800
committerJeremy Walker <jewalker@google.com>2017-11-07 13:44:36 -0800
commit14d387787557296021d1c15f0c39506c81813702 (patch)
treee1d4c2338544a8a4e4c9aef16695fbeaf37f21d3 /templates
parentd1697eae320ce57c78796867ef778d7196e9ad02 (diff)
downloadbuild-14d387787557296021d1c15f0c39506c81813702.tar.gz
Updates build script for Android 3.0.
Bug: 68863906 Test: Manually tested Wear devices. Change-Id: I4c875a6d5faaac0180d9876999de54b701cf1d5e
Diffstat (limited to 'templates')
-rw-r--r--templates/Wear/Wearable/build.gradle.ftl5
-rw-r--r--templates/WearPlusShared/Shared/build.gradle.ftl5
-rw-r--r--templates/WearPlusShared/Wearable/build.gradle.ftl5
-rw-r--r--templates/WearPlusShared/_MODULE_/build.gradle.ftl5
-rw-r--r--templates/base-application/_MODULE_/build.gradle.ftl16
-rw-r--r--templates/base/_MODULE_/build.gradle.ftl25
-rw-r--r--templates/create/_MODULE_/build.gradle.ftl5
-rw-r--r--templates/include/common.ftl6
8 files changed, 45 insertions, 27 deletions
diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl
index 6f8161a3..8fd1c1d1 100644
--- a/templates/Wear/Wearable/build.gradle.ftl
+++ b/templates/Wear/Wearable/build.gradle.ftl
@@ -15,11 +15,14 @@
-->
buildscript {
repositories {
+ maven {
+ url 'https://maven.google.com'
+ }
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
}
}
diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl
index 4fd221b9..45ac84f6 100644
--- a/templates/WearPlusShared/Shared/build.gradle.ftl
+++ b/templates/WearPlusShared/Shared/build.gradle.ftl
@@ -15,11 +15,14 @@
-->
buildscript {
repositories {
+ maven {
+ url 'https://maven.google.com'
+ }
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
}
}
diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl
index 21556857..cfef1ecc 100644
--- a/templates/WearPlusShared/Wearable/build.gradle.ftl
+++ b/templates/WearPlusShared/Wearable/build.gradle.ftl
@@ -15,11 +15,14 @@
-->
buildscript {
repositories {
+ maven {
+ url 'https://maven.google.com'
+ }
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
}
}
diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
index 73ba9f2e..e02ee2ca 100644
--- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl
+++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl
@@ -15,11 +15,14 @@
-->
buildscript {
repositories {
+ maven {
+ url 'https://maven.google.com'
+ }
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
}
}
diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl
index cb45485b..70027d60 100644
--- a/templates/base-application/_MODULE_/build.gradle.ftl
+++ b/templates/base-application/_MODULE_/build.gradle.ftl
@@ -22,7 +22,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
}
}
@@ -44,15 +44,15 @@ dependencies {
<#if !sample.auto_add_support_lib?has_content || sample.auto_add_support_lib == "true">
<#if sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 7>
- compile "com.android.support:support-v4:26.1.0"
+ compile "com.android.support:support-v4:27.0.0"
<#elseif sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 13>
- compile "com.android.support:support-v4:26.1.0"
- compile "com.android.support:gridlayout-v7:26.1.0"
- compile "com.android.support:cardview-v7:26.1.0"
+ compile "com.android.support:support-v4:27.0.0"
+ compile "com.android.support:gridlayout-v7:27.0.0"
+ compile "com.android.support:cardview-v7:27.0.0"
<#else>
- compile "com.android.support:support-v4:26.1.0"
- compile "com.android.support:support-v13:26.1.0"
- compile "com.android.support:cardview-v7:26.1.0"
+ compile "com.android.support:support-v4:27.0.0"
+ compile "com.android.support:support-v13:27.0.0"
+ compile "com.android.support:cardview-v7:27.0.0"
</#if>
</#if>
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index 175dabd6..dbc4670f 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -15,11 +15,14 @@
-->
buildscript {
repositories {
+ maven {
+ url 'https://maven.google.com'
+ }
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
}
}
@@ -40,18 +43,18 @@ repositories {
dependencies {
<#if !sample.auto_add_support_lib?has_content || sample.auto_add_support_lib == "true">
<#if sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 7>
- compile "com.android.support:support-v4:26.1.0"
- compile "com.android.support:appcompat-v7:26.1.0"
+ compile "com.android.support:support-v4:27.0.0"
+ compile "com.android.support:appcompat-v7:27.0.0"
<#elseif sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 13>
- compile "com.android.support:support-v4:26.1.0"
- compile "com.android.support:gridlayout-v7:26.1.0"
- compile "com.android.support:cardview-v7:26.1.0"
- compile "com.android.support:appcompat-v7:26.1.0"
+ compile "com.android.support:support-v4:27.0.0"
+ compile "com.android.support:gridlayout-v7:27.0.0"
+ compile "com.android.support:cardview-v7:27.0.0"
+ compile "com.android.support:appcompat-v7:27.0.0"
<#else>
- compile "com.android.support:support-v4:26.1.0"
- compile "com.android.support:support-v13:26.1.0"
- compile "com.android.support:cardview-v7:26.1.0"
- compile "com.android.support:appcompat-v7:26.1.0"
+ compile "com.android.support:support-v4:27.0.0"
+ compile "com.android.support:support-v13:27.0.0"
+ compile "com.android.support:cardview-v7:27.0.0"
+ compile "com.android.support:appcompat-v7:27.0.0"
</#if>
</#if>
<#list sample.dependency as dep>
diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl
index 25f1e1cf..84acd3e5 100644
--- a/templates/create/_MODULE_/build.gradle.ftl
+++ b/templates/create/_MODULE_/build.gradle.ftl
@@ -21,11 +21,14 @@ to recognize this as an Android project and start the template engine. -->
buildscript {
repositories {
+ maven {
+ url 'https://maven.google.com'
+ }
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.3.3'
+ classpath 'com.android.tools.build:gradle:3.0.0'
}
}
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index 820ec0fa..dd60cbdf 100644
--- a/templates/include/common.ftl
+++ b/templates/include/common.ftl
@@ -39,7 +39,7 @@
<#elseif (sample.compileSdkVersion)?has_content>
<#assign compile_sdk = sample.compileSdkVersion/>
<#else>
- <#assign compile_sdk = "26"/>
+ <#assign compile_sdk = "27"/>
</#if>
<#-- Set the MinSDK version. This is more complicated than it should be, because
the version can be either a number or a string (e.g. KeyLimePie) so we need to test
@@ -78,9 +78,9 @@
</#macro>
<#-- Set the global build tools version -->
-<#assign build_tools_version='"26.0.1"'/>
+<#assign build_tools_version='"26.0.2"'/>
-<#assign play_services_version="11.4.2"/>
+<#assign play_services_version="11.6.0"/>
<#assign play_services_wearable_dependency="'com.google.android.gms:play-services-wearable:${play_services_version}'"/>
<#assign android_support_v13_dependency="'com.android.support:support-v13:27.0.0'"/>