Skip to content

Commit 2e1eb6b

Browse files
committed
plugin-development: Correct a configuration cache problem in runServer
1 parent 2087db4 commit 2e1eb6b

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

plugin-development/src/main/java/org/spongepowered/gradle/plugin/SpongePluginGradle.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.gradle.api.file.FileCollection;
4343
import org.gradle.api.plugins.JavaLibraryPlugin;
4444
import org.gradle.api.plugins.JavaPlugin;
45+
import org.gradle.api.provider.Property;
4546
import org.gradle.api.provider.Provider;
4647
import org.gradle.api.tasks.JavaExec;
4748
import org.gradle.api.tasks.SourceSet;
@@ -50,6 +51,7 @@
5051
import org.gradle.jvm.tasks.Jar;
5152
import org.gradle.process.CommandLineArgumentProvider;
5253
import org.spongepowered.gradle.common.Constants;
54+
import org.spongepowered.gradle.common.SpongePlatform;
5355
import org.spongepowered.gradle.plugin.config.PluginConfiguration;
5456
import org.spongepowered.gradle.plugin.task.WritePluginMetadataTask;
5557

@@ -171,6 +173,7 @@ private TaskProvider<JavaExec> createRunTask(final NamedDomainObjectProvider<Con
171173
172174
*/
173175
final Directory projectDir = this.project.getLayout().getProjectDirectory();
176+
final Property<SpongePlatform> spongePlatform = sponge.platform();
174177
final TaskProvider<JavaExec> runServer = this.project.getTasks().register("runServer", JavaExec.class, task -> {
175178
task.setGroup(Constants.TASK_GROUP);
176179
task.setDescription("Run a Sponge server to test this plugin");
@@ -194,7 +197,7 @@ public Iterable<String> asArguments() {
194197
if (id instanceof ModuleComponentIdentifier) {
195198
final ModuleComponentIdentifier moduleId = (ModuleComponentIdentifier) id;
196199
if (moduleId.getGroup().equals(Constants.Dependencies.SPONGE_GROUP)
197-
&& moduleId.getModule().equals(sponge.platform().get().artifactId())) {
200+
&& moduleId.getModule().equals(spongePlatform.get().artifactId())) {
198201
task.getLogger().info("Using file {} as Sponge agent", dep.getFile());
199202
return Collections.singletonList("-javaagent:" + dep.getFile());
200203
}

0 commit comments

Comments
 (0)