This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 6f94fffca7 Made runSingle Gradle task work on Gradle 8.0 6f94fffca7 is described below commit 6f94fffca7ebf6e449f62fb7ab5aed0689edd384 Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Tue Jan 10 20:34:01 2023 -0800 Made runSingle Gradle task work on Gradle 8.0 --- .../modules/gradle/tooling/NetBeansRunSinglePlugin.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java index 2ca9b4335d..13cc06e64b 100644 --- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java +++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java @@ -28,11 +28,13 @@ import org.gradle.api.Project; import org.gradle.api.tasks.JavaExec; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.process.CommandLineArgumentProvider; +import org.gradle.util.GradleVersion; /** * * @author Laszlo Kishalmi */ class NetBeansRunSinglePlugin implements Plugin<Project> { + private static final GradleVersion GRADLE_VERSION = GradleVersion.current().getBaseVersion(); private static final Logger LOG = Logging.getLogger(NetBeansRunSinglePlugin.class); private static final String RUN_SINGLE_TASK = "runSingle"; @@ -81,8 +83,13 @@ class NetBeansRunSinglePlugin implements Plugin<Project> { SourceSetContainer sourceSets = project.getExtensions().findByType(SourceSetContainer.class); project.getTasks().register(RUN_SINGLE_TASK, JavaExec.class, (je) -> { - // Using setMain to keep the backward compatibility - je.setMain(project.property(RUN_SINGLE_MAIN).toString()); + String mainClass = project.property(RUN_SINGLE_MAIN).toString(); + if (GRADLE_VERSION.compareTo(GradleVersion.version("6.4")) < 0) { + // Using setMain to keep the backward compatibility before Gradle 6.4 + je.setMain(mainClass); + } else { + je.getMainClass().set(mainClass); + } je.setClasspath(sourceSets.findByName("main").getRuntimeClasspath()); if (project.hasProperty(RUN_SINGLE_ARGS)) { je.setArgs(asList(project.property(RUN_SINGLE_ARGS).toString().split(" "))); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists