[groovy] 02/02: remove gradle warnings

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 8f5a00dbbc2995765f389f21bfd17424b87285a1
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Apr 1 15:51:00 2022 +1000

    remove gradle warnings
---
 buildSrc/src/main/groovy/org.apache.groovy-core.gradle                 | 2 +-
 buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy | 2 +-
 subprojects/groovy-console/build.gradle                                | 2 +-
 subprojects/groovy-groovydoc/build.gradle                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle b/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
index 7a1fd01..4b3ff41 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
@@ -167,7 +167,7 @@ tasks.named('compileJava') {
     doLast {
         execOperations.javaexec { spec ->
             spec.classpath(rootProject.configurations.tools)
-            spec.main('org.jboss.bridger.Bridger')
+            spec.mainClass = 'org.jboss.bridger.Bridger'
             spec.args(groovyCore.classesToBridge.asList().collect { it.absolutePath })
         }
     }
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy b/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
index 3503dd2..c8c6a2e 100644
--- a/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
+++ b/buildSrc/src/main/groovy/org/apache/groovy/gradle/CoreExtension.groovy
@@ -39,7 +39,7 @@ class CoreExtension {
 
     void bridgedClasses(String... classes) {
         classes.each {
-            def baseDir = sourceSets.getByName("main").java.outputDir
+            def baseDir = sourceSets.getByName("main").java.classesDirectory.get().asFile
             classesToBridge.from(new File(baseDir, "/" + it.replace((char) '.', (char) '/') + ".class"))
         }
     }
diff --git a/subprojects/groovy-console/build.gradle b/subprojects/groovy-console/build.gradle
index 5e62961..54e2804 100644
--- a/subprojects/groovy-console/build.gradle
+++ b/subprojects/groovy-console/build.gradle
@@ -43,6 +43,6 @@ dependencies {
 tasks.register("console", JavaExec) {
     jvmArgs += ["-Dgroovy.attach.groovydoc=true"]
 
-    main = 'groovy.console.ui.Console'
+    mainClass = 'groovy.console.ui.Console'
     classpath = sourceSets.main.runtimeClasspath
 }
diff --git a/subprojects/groovy-groovydoc/build.gradle b/subprojects/groovy-groovydoc/build.gradle
index cbb1a28..8d3b7d0 100644
--- a/subprojects/groovy-groovydoc/build.gradle
+++ b/subprojects/groovy-groovydoc/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 
 compileJava {
     doLast {
-        mkdir "$sourceSets.main.java.outputDir/META-INF"
+        mkdir "${sourceSets.main.java.classesDirectory.get().asFile}/META-INF"
     }
 }