Fix build for API Level 24
Bug: 29392689
Change-Id: I0c54b57b7fcefcb905e22e50f3022bfb568b871a
diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl
index f994854..22ed44b 100644
--- a/templates/base-application/_MODULE_/build.gradle.ftl
+++ b/templates/base-application/_MODULE_/build.gradle.ftl
@@ -37,15 +37,15 @@
<#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:24.0.0-beta1"
+ compile "com.android.support:support-v4:24.0.0"
<#elseif sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 13>
- compile "com.android.support:support-v4:24.0.0-beta1"
- compile "com.android.support:gridlayout-v7:24.0.0-beta1"
- compile "com.android.support:cardview-v7:24.0.0-beta1"
+ compile "com.android.support:support-v4:24.0.0"
+ compile "com.android.support:gridlayout-v7:24.0.0"
+ compile "com.android.support:cardview-v7:24.0.0"
<#else>
- compile "com.android.support:support-v4:24.0.0-beta1"
- compile "com.android.support:support-v13:24.0.0-beta1"
- compile "com.android.support:cardview-v7:24.0.0-beta1"
+ compile "com.android.support:support-v4:24.0.0"
+ compile "com.android.support:support-v13:24.0.0"
+ compile "com.android.support:cardview-v7:24.0.0"
</#if>
</#if>
diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl
index 49e055a..be00ad9 100644
--- a/templates/base/_MODULE_/build.gradle.ftl
+++ b/templates/base/_MODULE_/build.gradle.ftl
@@ -37,18 +37,18 @@
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:24.0.0-beta1"
- compile "com.android.support:appcompat-v7:24.0.0-beta1"
+ compile "com.android.support:support-v4:24.0.0"
+ compile "com.android.support:appcompat-v7:24.0.0"
<#elseif sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 13>
- compile "com.android.support:support-v4:24.0.0-beta1"
- compile "com.android.support:gridlayout-v7:24.0.0-beta1"
- compile "com.android.support:cardview-v7:24.0.0-beta1"
- compile "com.android.support:appcompat-v7:24.0.0-beta1"
+ compile "com.android.support:support-v4:24.0.0"
+ compile "com.android.support:gridlayout-v7:24.0.0"
+ compile "com.android.support:cardview-v7:24.0.0"
+ compile "com.android.support:appcompat-v7:24.0.0"
<#else>
- compile "com.android.support:support-v4:24.0.0-beta1"
- compile "com.android.support:support-v13:24.0.0-beta1"
- compile "com.android.support:cardview-v7:24.0.0-beta1"
- compile "com.android.support:appcompat-v7:24.0.0-beta1"
+ compile "com.android.support:support-v4:24.0.0"
+ compile "com.android.support:support-v13:24.0.0"
+ compile "com.android.support:cardview-v7:24.0.0"
+ compile "com.android.support:appcompat-v7:24.0.0"
</#if>
</#if>
<#list sample.dependency as dep>
diff --git a/templates/include/common.ftl b/templates/include/common.ftl
index c1fd5b8..3991cb2 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 = "23"/>
+ <#assign compile_sdk = "24"/>
</#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
@@ -60,7 +60,7 @@
<#elseif (sample.minSdk)?has_content>
<#assign min_sdk = sample.minSdk/>
<#else>
- <#assign min_sdk = "23"/>
+ <#assign min_sdk = "24"/>
</#if>
<#-- Global macros -->
@@ -78,11 +78,11 @@
</#macro>
<#-- Set the global build tools version -->
-<#assign build_tools_version='"23.0.3"'/>
+<#assign build_tools_version='"24.0.0"'/>
<#assign play_services_version="8.4.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:24.0.0-beta1'"/>
+<#assign android_support_v13_dependency="'com.android.support:support-v13:24.0.0'"/>
<#assign wearable_support_dependency="'com.google.android.support:wearable:1.4.0'"/>
