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 1eff472c97 Fixed some Gradle introspection problems wit pre-6.1 Gradle
Versions
1eff472c97 is described below
commit 1eff472c976323bc350edbc99e99ead5d3f45a2b
Author: Laszlo Kishalmi
AuthorDate: Sun Nov 27 08:37:10 2022 -0800
Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
---
.../gradle/tooling/NbProjectInfoBuilder.java | 95 +-
.../gradle/api/GradleBaseProjectBuilder.java | 2 +-
2 files changed, 57 insertions(+), 40 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 5e8ecdc69f..a40b9d94f0 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
@@ -91,7 +91,6 @@ import org.gradle.api.logging.Logging;
import org.gradle.api.plugins.ExtensionAware;
import org.gradle.api.plugins.ExtensionContainer;
import org.gradle.api.plugins.ExtensionsSchema.ExtensionSchema;
-import org.gradle.api.plugins.JavaPlatformPlugin;
import org.gradle.api.provider.Provider;
import org.gradle.api.reflect.HasPublicType;
import org.gradle.api.reflect.TypeOf;
@@ -105,7 +104,7 @@ import org.gradle.jvm.JvmLibrary;
import org.gradle.language.base.artifact.SourcesArtifact;
import org.gradle.language.java.artifact.JavadocArtifact;
import org.gradle.plugin.use.PluginId;
-import org.gradle.util.VersionNumber;
+import org.gradle.util.GradleVersion;
import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo;
/**
@@ -176,8 +175,9 @@ class NbProjectInfoBuilder {
"war"
}));
+private static final GradleVersion GRADLE_VERSION =
GradleVersion.current().getBaseVersion();
+
final Project project;
-final VersionNumber gradleVersion;
final GradleInternalAdapter adapter;
public static final class ValueAndType {
@@ -197,9 +197,7 @@ class NbProjectInfoBuilder {
NbProjectInfoBuilder(Project project) {
this.project = project;
-this.gradleVersion =
VersionNumber.parse(project.getGradle().getGradleVersion());
-// checked that version 7.6.0 > 7.6.0-rc-1 in the VersionNumber order
-this.adapter = sinceGradleOrDefault("7.6.0-rc-1", () -> new
GradleInternalAdapter.Gradle76(project), () -> new
GradleInternalAdapter(project));
+this.adapter = sinceGradleOrDefault("7.6", () -> new
GradleInternalAdapter.Gradle76(project), () -> new
GradleInternalAdapter(project));
}
private NbProjectInfoModel model = new NbProjectInfoModel();
@@ -864,7 +862,7 @@ class NbProjectInfoBuilder {
model.getInfo().put("project_subProjects", sp);
Map ib = new HashMap<>();
-LOG.lifecycle("Gradle Version: {}", gradleVersion);
+LOG.lifecycle("Gradle Version: {}", GradleVersion.current());
sinceGradle("3.1", () -> {
for(IncludedBuild p: project.getGradle().getIncludedBuilds()) {
LOG.lifecycle("Include Build: {}", p.getName());
@@ -1016,36 +1014,44 @@ class NbProjectInfoBuilder {
}
if (Boolean.TRUE.equals(available.get(langId))) {
model.getInfo().put(propBase + lang,
storeSet(getProperty(sourceSet, langId, "srcDirs")));
-DirectoryProperty dirProp =
(DirectoryProperty)getProperty(sourceSet, langId, "classesDirectory");
-if (dirProp != null) {
-File outDir;
-
-if (dirProp.isPresent()) {
-outDir = dirProp.get().getAsFile();
-} else {
-// kotlin plugin uses some weird late
binding, so it has the output item, but it cannot be resolved to a
-// concrete file path at this time. Let's
make an approximation from
-Path candidate = null;
-if (base != null) {
-Path prefix = base.resolve(langId);
-// assume the language has just one
output dir in the source set:
-for (int i = 0; i < outPaths.size();
i++) {
-Path p = outPaths.get(i);
-if
