#554 Tasks that setMain now work with Gradle 6.4+

Followed example at https://github.com/franzbecker/gradle-lombok/pull/77/files

Author: rjrudin

examples/corb2-project/build.gradle

@@ -23,7 +23,7 @@ buildscript {
 }
 
 plugins {
-    id "com.marklogic.ml-gradle" version "3.17.0"
+    id "com.marklogic.ml-gradle" version "4.0.4"
 }
 
 repositories {

examples/corb2-project/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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip

examples/mlcp-project/build.gradle

@@ -5,7 +5,7 @@
  */
 
 plugins {
-	id "com.marklogic.ml-gradle" version "3.10.0"
+	id "com.marklogic.ml-gradle" version "4.0.4"
 }
 
 repositories {

examples/mlcp-project/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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=4.0.3
+version=4.0.4
 javadocsDir=../gh-pages-marklogic-java/javadocs
 
 mlAppDeployerDependency=com.marklogic:ml-app-deployer:4.0.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 22 14:27:38 EDT 2016
+#Fri Jul 17 11:35:34 EDT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME

src/main/groovy/com/marklogic/gradle/task/CorbTask.groovy

@@ -1,5 +1,6 @@
 package com.marklogic.gradle.task
 
+import org.gradle.api.Task
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.TaskAction
 
@@ -88,14 +89,20 @@ XQUERY-MODULE".tokenize(',')
   // corb defaults to 1, but 8 seems like a more common default
   def threadCount = 8 // THREAD-COUNT
 
-  @TaskAction
+	// Starting in Gradle 6.4, setMain must be called here instead of in a TaskAction method
+	@Override
+	Task configure(Closure closure) {
+		setMain("com.marklogic.developer.corb.Manager")
+		return super.configure(closure)
+	}
+
+	@TaskAction
   @Override
   public void exec() {
     //By convention, if there is a corb configuration, use it to set the classpath
     if (getProject().configurations.findByName('corb')) {
       setClasspath(getProject().configurations.corb)
     }
-    setMain("com.marklogic.developer.corb.Manager")
 
     Map options = buildCorbOptions()
     //CoRB2 will evaluate System properties for options

src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy

@@ -3,6 +3,7 @@ package com.marklogic.gradle.task
 import com.marklogic.client.DatabaseClient
 import com.marklogic.client.io.FileHandle
 import com.marklogic.contentpump.bean.MlcpBean
+import org.gradle.api.Task
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.gradle.api.tasks.JavaExec
@@ -35,10 +36,16 @@ class MlcpTask extends JavaExec {
 		return Logging.getLogger(MlcpTask.class)
 	}
 
+	// Starting in Gradle 6.4, setMain must be called here instead of in a TaskAction method
+	@Override
+	Task configure(Closure closure) {
+		setMain("com.marklogic.contentpump.ContentPump")
+		return super.configure(closure)
+	}
+
 	@TaskAction
 	@Override
 	void exec() {
-		setMain("com.marklogic.contentpump.ContentPump")
 		AppConfig config = getProject().property("mlAppConfig")
 
 		List<String> newArgs = new ArrayList<>()

src/main/groovy/com/marklogic/gradle/task/shell/ShellTask.groovy

@@ -1,6 +1,7 @@
 package com.marklogic.gradle.task.shell
 
 import org.gradle.api.Project
+import org.gradle.api.Task
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.TaskAction
 
@@ -18,10 +19,16 @@ import org.gradle.api.tasks.TaskAction
  */
 class ShellTask extends JavaExec {
 
+	// Starting in Gradle 6.4, setMain must be called here instead of in a TaskAction method
+	@Override
+	Task configure(Closure closure) {
+		setMain("com.marklogic.groovysh.Main")
+		return super.configure(closure)
+	}
+
 	@TaskAction
 	@Override
 	public void exec() {
-		setMain("com.marklogic.groovysh.Main")
 		setStandardInput(System.in)
 
 		Project project = getProject()