You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2021/11/22 21:34:47 UTC
[netbeans] branch master updated: Fixed some lost-in-translation issues with Gradle Tooling
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 5fb2d4a Fixed some lost-in-translation issues with Gradle Tooling
5fb2d4a is described below
commit 5fb2d4af96d8a62812f8d7613bdf61cb80d24b67
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Mon Nov 22 11:10:35 2021 -0800
Fixed some lost-in-translation issues with Gradle Tooling
---
.../gradle/tooling/NbProjectInfoBuilder.java | 2 +-
.../gradle/tooling/NetBeansExplodedWarPlugin.java | 16 +++---
.../gradle/tooling/NetBeansRunSinglePlugin.java | 61 ++++++++++------------
3 files changed, 37 insertions(+), 42 deletions(-)
diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 258afb4..73de19e 100644
--- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -480,7 +480,7 @@ class NbProjectInfoBuilder {
long time_report = System.currentTimeMillis();
model.registerPerf(depPrefix + "collect", time_report - time_collect);
- model.getInfo().put(configPrefix + "components", storeSet(componentIds));
+ model.getInfo().put(configPrefix + "components", componentIds);
model.getInfo().put(configPrefix + "projects", projectNames);
model.getInfo().put(configPrefix + "files", fileDeps);
model.getInfo().put(configPrefix + "unresolved", unresolvedIds);
diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.java b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.java
index c5fd19f..fe847d5 100644
--- a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.java
+++ b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansExplodedWarPlugin.java
@@ -22,7 +22,6 @@ package org.netbeans.modules.gradle.tooling;
import java.io.File;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
-import org.gradle.api.Task;
import org.gradle.api.tasks.Sync;
import org.gradle.api.tasks.bundling.War;
@@ -43,13 +42,14 @@ class NetBeansExplodedWarPlugin implements Plugin<Project> {
}
private void addTask(Project p) {
- War war = (War) p.property("war");
- Sync sync = new Sync();
- sync.setGroup("build");
- sync.into(new File(new File(p.getBuildDir(), "exploded"), war.getArchiveFileName().get()));
- sync.with(war);
- Task explodedWar = p.getTasks().create(EXPLODED_WAR_TASK, Sync.class, sync);
- war.getDependsOn().add(explodedWar);
+ War war = (War) p.getTasks().getByName("war");
+ p.getTasks().register(EXPLODED_WAR_TASK, Sync.class, (sync) -> {
+ sync.setGroup("build");
+ sync.into(new File(new File(p.getBuildDir(), "exploded"), war.getArchiveFileName().get()));
+ sync.with(war);
+
+ });
+ war.dependsOn(EXPLODED_WAR_TASK);
}
}
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 152dcfd..c112a09 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
@@ -20,14 +20,11 @@
package org.netbeans.modules.gradle.tooling;
import java.util.ArrayList;
-import java.util.Arrays;
import static java.util.Arrays.asList;
-import java.util.Map;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.tasks.JavaExec;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.process.CommandLineArgumentProvider;
+import org.gradle.api.tasks.SourceSetContainer;
/**
*
@@ -61,39 +58,37 @@ class NetBeansRunSinglePlugin implements Plugin<Project> {
}
private void addTask(Project project) {
- Map<String,SourceSet> sourceSets = (Map<String,SourceSet>) project.property("sourceSets");
+ SourceSetContainer sourceSets = project.getExtensions().findByType(SourceSetContainer.class);
- JavaExec je = new JavaExec();
- je.setMain(project.property(RUN_SINGLE_MAIN).toString());
- je.setClasspath(sourceSets.get("main").getRuntimeClasspath());
- je.setStandardInput(System.in);
-
- if (project.hasProperty(RUN_SINGLE_ARGS)) {
- je.setArgs(asList(project.property(RUN_SINGLE_ARGS).toString().split(" ")));
- }
+ project.getTasks().register(RUN_SINGLE_TASK, JavaExec.class, (je) -> {
+ // Using setMain to keep the backward compatibility
+ je.setMain(project.property(RUN_SINGLE_MAIN).toString());
+ je.setClasspath(sourceSets.findByName("main").getRuntimeClasspath());
+ je.setStandardInput(System.in);
+ if (project.hasProperty(RUN_SINGLE_ARGS)) {
+ je.setArgs(asList(project.property(RUN_SINGLE_ARGS).toString().split(" ")));
+ }
- if(project.hasProperty(RUN_SINGLE_CWD)) {
- je.setWorkingDir(project.property(RUN_SINGLE_CWD).toString());
- }
+ if(project.hasProperty(RUN_SINGLE_CWD)) {
+ je.setWorkingDir(project.property(RUN_SINGLE_CWD).toString());
+ }
- if (project.hasProperty(RUN_SINGLE_ENV)) {
- // Quoted space-separated expressions of <ENV_VAR>=<ENV_VALUE>
- // to set environment variables, or !<ENV_VAR>
- // to remove environment variables
- Arrays.stream(unescapeParameters(project.property(RUN_SINGLE_ENV).toString()))
- .forEach(env -> {
- if (env.startsWith("!")) {
- je.getEnvironment().remove(env);
- } else {
- int i = env.indexOf("=");
- if (i > 0) {
- je.getEnvironment().put(env.substring(0, i), env.substring(i + 1));
- }
+ if (project.hasProperty(RUN_SINGLE_ENV)) {
+ // Quoted space-separated expressions of <ENV_VAR>=<ENV_VALUE>
+ // to set environment variables, or !<ENV_VAR>
+ // to remove environment variables
+ for (String env : unescapeParameters(project.property(RUN_SINGLE_ENV).toString())) {
+ if (env.startsWith("!")) {
+ je.getEnvironment().remove(env);
+ } else {
+ int i = env.indexOf('=');
+ if (i > 0) {
+ je.getEnvironment().put(env.substring(0, i), env.substring(i + 1));
}
- });
- }
-
- project.getTasks().create(RUN_SINGLE_TASK, JavaExec.class, je);
+ }
+ }
+ }
+ });
}
private String[] unescapeParameters(String s) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists