From e81a22cf78fd565e29987b388f50b5a72b4fd9ff Mon Sep 17 00:00:00 2001 From: Jeremy Walker Date: Thu, 11 Jul 2019 15:24:05 -0700 Subject: Replaces << (deprecated in 4.x and removed in 5.0) with doLast. Test: Manually tested. Bug: 137389675 Change-Id: I60699253dad6a3115dd64ecbc5188d10a08de706 --- .../example/android/samples/build/SampleGenPlugin.groovy | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenPlugin.groovy b/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenPlugin.groovy index faa29737..e60f1f6a 100644 --- a/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenPlugin.groovy +++ b/buildSrc/src/main/groovy/com/example/android/samples/build/SampleGenPlugin.groovy @@ -89,8 +89,17 @@ class SampleGenPlugin implements Plugin { project.refresh.dependsOn(project.processCommon) // People get nervous when they see a task with no actions, so... - project.create << {println "Project creation finished."} - project.refresh << {println "Project refresh finished."} + project.create { + doLast { + println "Project creation finished." + } + } + + project.refresh { + doLast { + println "Project refresh finished." + } + } }) } -- cgit v1.2.3 From d861c6d2a3b2bcba06b0e2b4d507f6a023d501c3 Mon Sep 17 00:00:00 2001 From: Jeremy Walker Date: Thu, 11 Jul 2019 15:44:31 -0700 Subject: Fix gradle versions. Bug: 137389675 Test: Manually tested. Change-Id: Id3bf8e15a0fda711f33f21ec38427ad1672a71ab --- templates/Wear/Wearable/build.gradle.ftl | 2 +- templates/WearPlusShared/Shared/build.gradle.ftl | 2 +- templates/WearPlusShared/Wearable/build.gradle.ftl | 2 +- templates/WearPlusShared/_MODULE_/build.gradle.ftl | 2 +- templates/base-application/_MODULE_/build.gradle.ftl | 2 +- templates/base/_MODULE_/build.gradle.ftl | 2 +- templates/create/_MODULE_/build.gradle.ftl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/Wear/Wearable/build.gradle.ftl b/templates/Wear/Wearable/build.gradle.ftl index 5a8e19b1..e490b5a9 100644 --- a/templates/Wear/Wearable/build.gradle.ftl +++ b/templates/Wear/Wearable/build.gradle.ftl @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.2' } } diff --git a/templates/WearPlusShared/Shared/build.gradle.ftl b/templates/WearPlusShared/Shared/build.gradle.ftl index 4f99332b..c8db84fa 100644 --- a/templates/WearPlusShared/Shared/build.gradle.ftl +++ b/templates/WearPlusShared/Shared/build.gradle.ftl @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.2' } } diff --git a/templates/WearPlusShared/Wearable/build.gradle.ftl b/templates/WearPlusShared/Wearable/build.gradle.ftl index a50f652b..64233966 100644 --- a/templates/WearPlusShared/Wearable/build.gradle.ftl +++ b/templates/WearPlusShared/Wearable/build.gradle.ftl @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.2' } } diff --git a/templates/WearPlusShared/_MODULE_/build.gradle.ftl b/templates/WearPlusShared/_MODULE_/build.gradle.ftl index ebc8732b..32c6473a 100644 --- a/templates/WearPlusShared/_MODULE_/build.gradle.ftl +++ b/templates/WearPlusShared/_MODULE_/build.gradle.ftl @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.2' } } diff --git a/templates/base-application/_MODULE_/build.gradle.ftl b/templates/base-application/_MODULE_/build.gradle.ftl index 4675f61b..b5d32ed3 100644 --- a/templates/base-application/_MODULE_/build.gradle.ftl +++ b/templates/base-application/_MODULE_/build.gradle.ftl @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.2' } } diff --git a/templates/base/_MODULE_/build.gradle.ftl b/templates/base/_MODULE_/build.gradle.ftl index 02437945..427e2917 100644 --- a/templates/base/_MODULE_/build.gradle.ftl +++ b/templates/base/_MODULE_/build.gradle.ftl @@ -20,7 +20,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.2' } } diff --git a/templates/create/_MODULE_/build.gradle.ftl b/templates/create/_MODULE_/build.gradle.ftl index d1816c8f..bb8663e4 100644 --- a/templates/create/_MODULE_/build.gradle.ftl +++ b/templates/create/_MODULE_/build.gradle.ftl @@ -26,7 +26,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.4.2' } } -- cgit v1.2.3