diff options
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
-rw-r--r-- | templates/Wear/Wearable/build.gradle.ftl | 7 | ||||
-rw-r--r-- | templates/WearPlusShared/Shared/build.gradle.ftl | 7 | ||||
-rw-r--r-- | templates/WearPlusShared/Wearable/build.gradle.ftl | 7 | ||||
-rw-r--r-- | templates/WearPlusShared/_MODULE_/build.gradle.ftl | 7 | ||||
-rw-r--r-- | templates/base-application/_MODULE_/build.gradle.ftl | 22 | ||||
-rw-r--r-- | templates/base/_MODULE_/build.gradle.ftl | 25 | ||||
-rw-r--r-- | templates/create/_MODULE_/build.gradle.ftl | 7 | ||||
-rw-r--r-- | templates/create/gradle/wrapper/gradle-wrapper.properties | 2 | ||||
-rw-r--r-- | templates/include/common.ftl | 8 |
10 files changed, 29 insertions, 65 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cc1ab71e..3eb3533b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl index fdbd0e00..b8870905 100644 --- a/templates/Wear/Wearable/build.gradle.ftl +++ b/templates/Wear/Wearable/build.gradle.ftl @@ -20,12 +20,7 @@ buildscript { } dependencies { - <#-- TODO (jewalker): Remove once 3.2 is in production. --> - <#if sample.androidX?? && sample.androidX?has_content && sample.androidX == "true"> - classpath 'com.android.tools.build:gradle:3.2.0-beta01' - <#else> - classpath 'com.android.tools.build:gradle:3.1.3' - </#if> + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl index 7e8b8ab7..aae57e2d 100644 --- a/templates/WearPlusShared/Shared/build.gradle.ftl +++ b/templates/WearPlusShared/Shared/build.gradle.ftl @@ -20,12 +20,7 @@ buildscript { } dependencies { - <#-- TODO (jewalker): Remove once 3.2 is in production. --> - <#if sample.androidX?? && sample.androidX?has_content && sample.androidX == "true"> - classpath 'com.android.tools.build:gradle:3.2.0-beta01' - <#else> - classpath 'com.android.tools.build:gradle:3.1.3' - </#if> + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl index f997da18..7ad7e1ad 100644 --- a/templates/WearPlusShared/Wearable/build.gradle.ftl +++ b/templates/WearPlusShared/Wearable/build.gradle.ftl @@ -20,12 +20,7 @@ buildscript { } dependencies { - <#-- TODO (jewalker): Remove once 3.2 is in production. --> - <#if sample.androidX?? && sample.androidX?has_content && sample.androidX == "true"> - classpath 'com.android.tools.build:gradle:3.2.0-beta01' - <#else> - classpath 'com.android.tools.build:gradle:3.1.3' - </#if> + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl index 251061e9..fd25a7df 100644 --- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl +++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl @@ -20,12 +20,7 @@ buildscript { } dependencies { - <#-- TODO (jewalker): Remove once 3.2 is in production. --> - <#if sample.androidX?? && sample.androidX?has_content && sample.androidX == "true"> - classpath 'com.android.tools.build:gradle:3.2.0-beta01' - <#else> - classpath 'com.android.tools.build:gradle:3.1.3' - </#if> + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl index 6030d00e..35a4b410 100644 --- a/templates/base-application/_MODULE_/build.gradle.ftl +++ b/templates/base-application/_MODULE_/build.gradle.ftl @@ -20,13 +20,7 @@ buildscript { } dependencies { - - <#-- TODO (jewalker): Remove once 3.2 is in production. --> - <#if sample.androidX?? && sample.androidX?has_content && sample.androidX == "true"> - classpath 'com.android.tools.build:gradle:3.2.0-beta01' - <#else> - classpath 'com.android.tools.build:gradle:3.1.3' - </#if> + classpath 'com.android.tools.build:gradle:3.2.1' } } @@ -48,15 +42,15 @@ dependencies { <#if !sample.androidX?? || !sample.androidX?has_content || sample.androidX == "false"> <#if !sample.auto_add_support_lib?has_content || sample.auto_add_support_lib == "true"> <#if sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 7> - implementation "com.android.support:support-v4:27.1.1" + implementation "com.android.support:support-v4:28.0.0" <#elseif sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 13> - implementation "com.android.support:support-v4:27.1.1" - implementation "com.android.support:gridlayout-v7:27.1.1" - implementation "com.android.support:cardview-v7:27.1.1" + implementation "com.android.support:support-v4:28.0.0" + implementation "com.android.support:gridlayout-v7:28.0.0" + implementation "com.android.support:cardview-v7:28.0.0" <#else> - implementation "com.android.support:support-v4:27.1.1" - implementation "com.android.support:support-v13:27.1.1" - implementation "com.android.support:cardview-v7:27.1.1" + implementation "com.android.support:support-v4:28.0.0" + implementation "com.android.support:support-v13:28.0.0" + implementation "com.android.support:cardview-v7:28.0.0" </#if> </#if> </#if> diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl index 49aff8d2..22c50905 100644 --- a/templates/base/_MODULE_/build.gradle.ftl +++ b/templates/base/_MODULE_/build.gradle.ftl @@ -20,12 +20,7 @@ buildscript { } dependencies { - <#-- TODO (jewalker): Remove once 3.2 is in production. --> - <#if sample.androidX?? && sample.androidX?has_content && sample.androidX == "true"> classpath 'com.android.tools.build:gradle:3.2.1' - <#else> - classpath 'com.android.tools.build:gradle:3.1.3' - </#if> } } @@ -48,18 +43,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> - implementation "com.android.support:support-v4:27.1.1" - implementation "com.android.support:appcompat-v7:27.1.1" + implementation "com.android.support:support-v4:28.0.0" + implementation "com.android.support:appcompat-v7:28.0.0" <#elseif sample.minSdk?matches(r'^\d+$') && sample.minSdk?number < 13> - implementation "com.android.support:support-v4:27.1.1" - implementation "com.android.support:gridlayout-v7:27.1.1" - implementation "com.android.support:cardview-v7:27.1.1" - implementation "com.android.support:appcompat-v7:27.1.1" + implementation "com.android.support:support-v4:28.0.0" + implementation "com.android.support:gridlayout-v7:28.0.0" + implementation "com.android.support:cardview-v7:28.0.0" + implementation "com.android.support:appcompat-v7:28.0.0" <#else> - implementation "com.android.support:support-v4:27.1.1" - implementation "com.android.support:support-v13:27.1.1" - implementation "com.android.support:cardview-v7:27.1.1" - implementation "com.android.support:appcompat-v7:27.1.1" + implementation "com.android.support:support-v4:28.0.0" + implementation "com.android.support:support-v13:28.0.0" + implementation "com.android.support:cardview-v7:28.0.0" + implementation "com.android.support:appcompat-v7:28.0.0" </#if> </#if> diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl index 187534cd..479d7da1 100644 --- a/templates/create/_MODULE_/build.gradle.ftl +++ b/templates/create/_MODULE_/build.gradle.ftl @@ -26,12 +26,7 @@ buildscript { } dependencies { - <#-- TODO (jewalker): Remove once 3.2 is in production. --> - <#if sample.androidX?? && sample.androidX?has_content && sample.androidX == "true"> - classpath 'com.android.tools.build:gradle:3.2.0-beta01' - <#else> - classpath 'com.android.tools.build:gradle:3.1.3' - </#if> + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/templates/create/gradle/wrapper/gradle-wrapper.properties b/templates/create/gradle/wrapper/gradle-wrapper.properties index eaba3011..9cd76d83 100644 --- a/templates/create/gradle/wrapper/gradle-wrapper.properties +++ b/templates/create/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/templates/include/common.ftl b/templates/include/common.ftl index eafd537e..bfa9cfda 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 = "27"/> + <#assign compile_sdk = "28"/> </#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 @@ -83,8 +83,8 @@ <#assign play_services_version="15.0.1"/> <#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.1.1'"/> +<#assign android_support_v13_dependency="'com.android.support:support-v13:28.0.0'"/> -<#assign wearable_support_dependency="'com.google.android.support:wearable:2.3.0'"/> +<#assign wearable_support_dependency="'com.google.android.support:wearable:2.4.0'"/> -<#assign wearable_support_provided_dependency="'com.google.android.wearable:wearable:2.3.0'"/> +<#assign wearable_support_provided_dependency="'com.google.android.wearable:wearable:2.4.0'"/> |