Merge pull request #41 from optyfr/main

esocode · web-flow · commit fc0e55157c50 · 2026-05-10T09:42:45.000+02:00
Compatibility with Gradle 9
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,6 +11,6 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - name: Build with Gradle
         run: ./gradlew build
diff --git a/README.md b/README.md
@@ -5,6 +5,13 @@ GWT Gradle Plugin
 Release notes
 -------------
 
+* 1.3.0: Compatibility with Gradle versions 9.x
+    * Minimum Gradle version 8.x
+    * Gradle 8.14.4 build
+    * Minimum Java 17 for building
+
+---------
+
 * 1.2.1: Fix - with envClassPath true classpath entries are now split at
   semicolons
 
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "java-library"
     id "java-gradle-plugin"
     id "com.gradle.plugin-publish" version "2.0.0"
-    id "pl.allegro.tech.build.axion-release" version "1.16.1"
+    id "pl.allegro.tech.build.axion-release" version "1.21.1"
     id "com.vanniktech.maven.publish" version "0.26.0"
 }
 
@@ -27,16 +27,16 @@ dependencies {
 }
 
 processResources {
-    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 publishing {
     publications {
         pluginPublication(MavenPublication) {
             from components.java
-            groupId project.group
-            artifactId project.name
-            version project.version
+            groupId = project.group
+            artifactId = project.name
+            version = project.version
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase = GRADLE_USER_HOME
 distributionPath = wrapper/dists
 zipStoreBase     = GRADLE_USER_HOME
 zipStorePath     = wrapper/dists
-distributionUrl  = https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl  = https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
diff --git a/src/main/java/de/esoco/gwt/gradle/GwtLibPlugin.java b/src/main/java/de/esoco/gwt/gradle/GwtLibPlugin.java
@@ -23,7 +23,7 @@
 import org.gradle.api.artifacts.dsl.DependencyHandler;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin;
 import org.gradle.api.plugins.WarPlugin;
 import org.gradle.api.tasks.SourceSet;
@@ -64,12 +64,12 @@ public void apply(Project project) {
 	}
 
 	private void includeSourcesForTest(Project project) {
-		JavaPluginConvention javaConvention = project.getConvention()
-		                                             .getPlugin(JavaPluginConvention.class);
+		JavaPluginExtension javaExtension = project.getExtensions()
+		                                             .getByType(JavaPluginExtension.class);
 
-		SourceSet mainSourset = javaConvention.getSourceSets()
+		SourceSet mainSourset = javaExtension.getSourceSets()
 		                                      .getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-		SourceSet testSourset = javaConvention.getSourceSets()
+		SourceSet testSourset = javaExtension.getSourceSets()
 		                                      .getByName(SourceSet.TEST_SOURCE_SET_NAME);
 
 		FileCollection testClasspath = project.files(mainSourset.getAllSource()
@@ -85,16 +85,16 @@ private void includeSourcesForTest(Project project) {
 		Test test = project.getTasks().withType(Test.class).getByName("test");
 		test.getSystemProperties()
 		    .put("gwt.persistentunitcachedir",
-		         project.getBuildDir() + GwtExtension.DIRECTORY + "/test");
+		         project.getLayout().getBuildDirectory().getAsFile().get() + GwtExtension.DIRECTORY + "/test");
 	}
 
 	private void includeSourcesToJar(Project project) {
 		Jar                  jarTask        = project.getTasks()
 		                                             .withType(Jar.class)
 		                                             .getByName("jar");
-		JavaPluginConvention javaConvention = project.getConvention()
-		                                             .getPlugin(JavaPluginConvention.class);
-		SourceSet            mainSourset    = javaConvention.getSourceSets()
+		JavaPluginExtension javaExtension = project.getExtensions()
+		                                             .getByType(JavaPluginExtension.class);
+		SourceSet            mainSourset    = javaExtension.getSourceSets()
 		                                                    .getByName("main");
 		jarTask.from(mainSourset.getAllSource());
 	}
diff --git a/src/main/java/de/esoco/gwt/gradle/GwtPlugin.java b/src/main/java/de/esoco/gwt/gradle/GwtPlugin.java
@@ -71,11 +71,11 @@ public void apply(final Project project) {
 	// }
 
 	private void createStopTask(Project project) {
-		project.getTasks().create(GwtStopTask.NAME, GwtStopTask.class);
+		project.getTasks().register(GwtStopTask.NAME, GwtStopTask.class);
 	}
 
 	private void createCheckTask(final Project project) {
-		project.getTasks().create(GwtCheckTask.NAME, GwtCheckTask.class);
+		project.getTasks().register(GwtCheckTask.NAME, GwtCheckTask.class);
 		final GwtExtension extension = project.getExtensions().getByType(GwtExtension.class);
 		final Task checkTask = project.getTasks().getByName(JavaBasePlugin.CHECK_TASK_NAME);
 		checkTask.dependsOn(GwtCheckTask.NAME);
@@ -88,7 +88,7 @@ public void execute(final GwtCheckTask task) {
 	}
 
 	private void createCompileTask(final Project project) {
-		project.getTasks().create(GwtCompileTask.NAME, GwtCompileTask.class);
+		project.getTasks().register(GwtCompileTask.NAME, GwtCompileTask.class);
 		final GwtExtension extension = project.getExtensions().getByType(GwtExtension.class);
 		final War warTask = project.getTasks().withType(War.class).getByName("war");
 		warTask.dependsOn(GwtCompileTask.NAME);
@@ -102,11 +102,11 @@ public void execute(final GwtCompileTask task) {
 	}
 
 	private void createRunTask(final Project project) {
-		project.getTasks().create(GwtRunTask.NAME, GwtRunTask.class);
+		project.getTasks().register(GwtRunTask.NAME, GwtRunTask.class);
 	}
 
 	private void createCodeServerTask(final Project project) {
-		project.getTasks().create(GwtCodeServerTask.NAME, GwtCodeServerTask.class);
+		project.getTasks().register(GwtCodeServerTask.NAME, GwtCodeServerTask.class);
 		final GwtExtension extension = project.getExtensions().getByType(GwtExtension.class);
 		project.getTasks().withType(GwtCodeServerTask.class, new Action<GwtCodeServerTask>() {
 			@Override
@@ -118,7 +118,7 @@ public void execute(final GwtCodeServerTask task) {
 	}
 
 	private void createDevTask(final Project project) {
-		project.getTasks().create(GwtDevTask.NAME, GwtDevTask.class);
+		project.getTasks().register(GwtDevTask.NAME, GwtDevTask.class);
 		final GwtExtension extension = project.getExtensions().getByType(GwtExtension.class);
 		project.getTasks().withType(GwtDevTask.class, new Action<GwtDevTask>() {
 			@Override
@@ -127,4 +127,4 @@ public void execute(final GwtDevTask task) {
 			}
 		});
 	}
-}
+}
diff --git a/src/main/java/de/esoco/gwt/gradle/command/AbstractCommand.java b/src/main/java/de/esoco/gwt/gradle/command/AbstractCommand.java
@@ -29,8 +29,9 @@
 import org.gradle.api.artifacts.ProjectDependency;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.process.ExecOperations;
 import org.gradle.process.ExecResult;
 import org.gradle.process.JavaExecSpec;
 
@@ -51,11 +52,14 @@ public abstract class AbstractCommand {
 
 	private final String mainClass;
 
+	private final ExecOperations execOperations;
+
 	private JavaOption javaOptions;
 
-	public AbstractCommand(Project project, String mainClass) {
+	public AbstractCommand(Project project, ExecOperations execOperations, String mainClass) {
 
 		this.project = project;
+		this.execOperations = execOperations;
 		this.mainClass = mainClass;
 
 		javaArgs.add("-Dfile.encoding=" + Charset.defaultCharset().name());
@@ -162,7 +166,7 @@ public void configureJavaArgs(JavaOption javaOptions) {
 
 	public void execute() {
 
-		ExecResult execResult = project.javaexec(new Action<JavaExecSpec>() {
+		ExecResult execResult = execOperations.javaexec(new Action<JavaExecSpec>() {
 
 			@Override
 			public void execute(JavaExecSpec spec) {
@@ -202,15 +206,15 @@ protected Collection<File> getDependencySourceDirs(Project project) {
 		for (Dependency dep : depSet) {
 			if (dep instanceof ProjectDependency) {
 				Project projectDependency =
-					((ProjectDependency) dep).getDependencyProject();
+					project.project(((ProjectDependency) dep).getPath());
 
 				if (projectDependency
 					.getPlugins()
 					.hasPlugin(GwtLibPlugin.class)) {
-					JavaPluginConvention javaConvention = projectDependency
-						.getConvention()
-						.getPlugin(JavaPluginConvention.class);
-					SourceSet mainSourceSet = javaConvention
+					JavaPluginExtension javaExtension = projectDependency
+						.getExtensions()
+						.getByType(JavaPluginExtension.class);
+					SourceSet mainSourceSet = javaExtension
 						.getSourceSets()
 						.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
 
diff --git a/src/main/java/de/esoco/gwt/gradle/command/CodeServerCommand.java b/src/main/java/de/esoco/gwt/gradle/command/CodeServerCommand.java
@@ -23,8 +23,9 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.plugins.JavaPluginConvention;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.SourceSet;
+import org.gradle.process.ExecOperations;
 
 import java.io.File;
 
@@ -33,10 +34,11 @@
 
 public class CodeServerCommand extends AbstractCommand {
 
-	public CodeServerCommand(Project project, GwtExtension extension,
+	public CodeServerCommand(Project project, ExecOperations execOperations,
+	                         GwtExtension extension,
 	                         Collection<String> modules) {
 
-		super(project, "com.google.gwt.dev.codeserver.CodeServer");
+		super(project, execOperations, "com.google.gwt.dev.codeserver.CodeServer");
 
 		configure(project, extension, modules);
 	}
@@ -55,7 +57,7 @@ public void configure(Project project, GwtExtension extension,
 		    configs.getByName(GwtLibPlugin.CONF_GWT_SDK);
 
 		SourceSet      mainSourceSet =
-		    project.getConvention().getPlugin(JavaPluginConvention.class)
+		    project.getExtensions().getByType(JavaPluginExtension.class)
 		           .getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
 		FileCollection sources       =
 		    project.files(mainSourceSet.getAllJava().getSrcDirs());
diff --git a/src/main/java/de/esoco/gwt/gradle/command/CompileCommand.java b/src/main/java/de/esoco/gwt/gradle/command/CompileCommand.java
@@ -22,6 +22,7 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.process.ExecOperations;
 
 import java.io.File;
 
@@ -30,11 +31,12 @@
 
 public class CompileCommand extends AbstractCommand {
 
-	public CompileCommand(Project project, CompilerOption compilerOptions,
+	public CompileCommand(Project project, ExecOperations execOperations,
+	                      CompilerOption compilerOptions,
 	                      FileCollection sources, File war,
 	                      Collection<String> modules) {
 
-		super(project, "com.google.gwt.dev.Compiler");
+		super(project, execOperations, "com.google.gwt.dev.Compiler");
 
 		configure(project, compilerOptions, sources, war, modules);
 	}
@@ -50,7 +52,7 @@ private void configure(Project project, CompilerOption compilerOptions,
 		           .getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME);
 
 		configureJavaArgs(compilerOptions);
-		addJavaArgs("-Dgwt.persistentunitcachedir=" + project.getBuildDir() +
+		addJavaArgs("-Dgwt.persistentunitcachedir=" + project.getLayout().getBuildDirectory().getAsFile().get() +
 		            "/" + GwtExtension.DIRECTORY + "/work/cache");
 
 		for (File sourceDir : sources) {
diff --git a/src/main/java/de/esoco/gwt/gradle/command/JettyServerCommand.java b/src/main/java/de/esoco/gwt/gradle/command/JettyServerCommand.java
@@ -22,16 +22,18 @@
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.plugins.WarPlugin;
+import org.gradle.process.ExecOperations;
 
 import java.io.File;
 
 
 public class JettyServerCommand extends AbstractCommand {
 
-	public JettyServerCommand(Project project, JettyOption jettyOption,
+	public JettyServerCommand(Project project, ExecOperations execOperations,
+	                          JettyOption jettyOption,
 	                          File jettyConf) {
 
-		super(project, "org.eclipse.jetty.runner.Runner");
+		super(project, execOperations, "org.eclipse.jetty.runner.Runner");
 
 		configure(project, jettyOption, jettyConf);
 	}
diff --git a/src/main/java/de/esoco/gwt/gradle/extension/CompilerOption.java b/src/main/java/de/esoco/gwt/gradle/extension/CompilerOption.java
@@ -305,7 +305,7 @@ public File getWorkDir() {
 	public void init(Project project) {
 
 		final File buildDir =
-		    new File(project.getBuildDir(), GwtExtension.DIRECTORY);
+		    new File(project.getLayout().getBuildDirectory().getAsFile().get(), GwtExtension.DIRECTORY);
 
 		this.war              = new File(buildDir, "out");
 		this.workDir          = new File(buildDir, "work");
diff --git a/src/main/java/de/esoco/gwt/gradle/extension/DevOption.java b/src/main/java/de/esoco/gwt/gradle/extension/DevOption.java
@@ -265,7 +265,7 @@ public File getLauncherDir() {
 	}
 
 	public void init(Project project) {
-		final File buildDir = new File(project.getBuildDir(), GwtExtension.DIRECTORY);
+		final File buildDir = new File(project.getLayout().getBuildDirectory().getAsFile().get(), GwtExtension.DIRECTORY);
 
 		this.war = new File(buildDir, "warDev");
 		this.workDir = new File(buildDir, "work");
diff --git a/src/main/java/de/esoco/gwt/gradle/extension/GwtExtension.java b/src/main/java/de/esoco/gwt/gradle/extension/GwtExtension.java
@@ -17,12 +17,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.gradle.util.ConfigureUtil;
+import org.gradle.api.Action;
 
 import com.google.common.collect.Lists;
 
-import groovy.lang.Closure;
-
 public class GwtExtension {
 	
 	public static final String NAME = "gwt";
@@ -95,8 +93,8 @@ public void setDev(DevOption dev) {
 		this.dev = dev;
 	}
 
-	public GwtExtension dev(Closure<DevOption> c) {
-		ConfigureUtil.configure(c, dev);
+	public GwtExtension dev(Action<DevOption> action) {
+		action.execute(dev);
 		return this;
 	}
 
@@ -108,8 +106,8 @@ public void setCompile(CompilerOption compile) {
 		this.compile = compile;
 	}
 
-	public GwtExtension compile(Closure<CompilerOption> c) {
-		ConfigureUtil.configure(c, compile);
+	public GwtExtension compile(Action<CompilerOption> action) {
+		action.execute(compile);
 		return this;
 	}
 
@@ -121,8 +119,8 @@ public void setJetty(JettyOption jetty) {
 		this.jetty = jetty;
 	}
 
-	public GwtExtension jetty(Closure<JettyOption> c) {
-		ConfigureUtil.configure(c, jetty);
+	public GwtExtension jetty(Action<JettyOption> action) {
+		action.execute(jetty);
 		return this;
 	}
 
diff --git a/src/main/java/de/esoco/gwt/gradle/task/AbstractTask.java b/src/main/java/de/esoco/gwt/gradle/task/AbstractTask.java
@@ -14,13 +14,26 @@
  */
 package de.esoco.gwt.gradle.task;
 
-import de.esoco.gwt.gradle.extension.GwtExtension;
+import javax.inject.Inject;
 
 import org.gradle.api.DefaultTask;
+import org.gradle.api.tasks.Internal;
+import org.gradle.process.ExecOperations;
+
+import de.esoco.gwt.gradle.extension.GwtExtension;
 
 public abstract class AbstractTask extends DefaultTask {
 
-	public AbstractTask() {
+	private final ExecOperations execOperations;
+
+	@Inject
+	protected AbstractTask(ExecOperations execOperations) {
+		this.execOperations = execOperations;
 		setGroup(GwtExtension.NAME);
 	}
-}
+
+	@Internal
+	protected ExecOperations getExecOperations() {
+		return execOperations;
+	}
+}
diff --git a/src/main/java/de/esoco/gwt/gradle/task/GwtCheckTask.java b/src/main/java/de/esoco/gwt/gradle/task/GwtCheckTask.java
diff --git a/src/main/java/de/esoco/gwt/gradle/task/GwtCodeServerTask.java b/src/main/java/de/esoco/gwt/gradle/task/GwtCodeServerTask.java
diff --git a/src/main/java/de/esoco/gwt/gradle/task/GwtCompileTask.java b/src/main/java/de/esoco/gwt/gradle/task/GwtCompileTask.java
diff --git a/src/main/java/de/esoco/gwt/gradle/task/GwtDevTask.java b/src/main/java/de/esoco/gwt/gradle/task/GwtDevTask.java
diff --git a/src/main/java/de/esoco/gwt/gradle/task/GwtRunTask.java b/src/main/java/de/esoco/gwt/gradle/task/GwtRunTask.java
diff --git a/src/main/java/de/esoco/gwt/gradle/task/GwtSetUpTask.java b/src/main/java/de/esoco/gwt/gradle/task/GwtSetUpTask.java
diff --git a/src/main/java/de/esoco/gwt/gradle/task/GwtStopTask.java b/src/main/java/de/esoco/gwt/gradle/task/GwtStopTask.java

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`id "java-library"`
`3`	`3`	`id "java-gradle-plugin"`
`4`	`4`	`id "com.gradle.plugin-publish" version "2.0.0"`
`5`		`- id "pl.allegro.tech.build.axion-release" version "1.16.1"`
	`5`	`+ id "pl.allegro.tech.build.axion-release" version "1.21.1"`
`6`	`6`	`id "com.vanniktech.maven.publish" version "0.26.0"`
`7`	`7`	`}`
`8`	`8`
`@@ -27,16 +27,16 @@ dependencies {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`processResources {`
`30`		`- duplicatesStrategy(DuplicatesStrategy.EXCLUDE)`
	`30`	`+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`publishing {`
`34`	`34`	`publications {`
`35`	`35`	`pluginPublication(MavenPublication) {`
`36`	`36`	`from components.java`
`37`		`- groupId project.group`
`38`		`- artifactId project.name`
`39`		`- version project.version`
	`37`	`+ groupId = project.group`
	`38`	`+ artifactId = project.name`
	`39`	`+ version = project.version`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`