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 2020/09/26 17:52:30 UTC
[netbeans] branch master updated: [NETBEANS-4848] Use compile
classpath as annotation path before Gradle 5.0
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 90db5b2 [NETBEANS-4848] Use compile classpath as annotation path before Gradle 5.0
90db5b2 is described below
commit 90db5b2b2af6ec7727751adf2a1b04c0c9779f17
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Fri Sep 25 12:25:27 2020 -0700
[NETBEANS-4848] Use compile classpath as annotation path before Gradle 5.0
---
.../org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy | 5 +++++
.../gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy
index 76d378b..081d756 100644
--- a/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy
+++ b/extide/gradle/netbeans-gradle-tooling/src/main/groovy/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.groovy
@@ -252,6 +252,11 @@ class NbProjectInfoBuilder {
}
model.info["sourceset_${sourceSet.name}_configuration_annotation"] = sourceSet.annotationProcessorConfigurationName;
}
+ beforeGradle('5.0') {
+ if (model.info["sourceset_${sourceSet.name}_classpath_annotation"] == null || model.info["sourceset_${sourceSet.name}_classpath_annotation"].isEmpty()) {
+ model.info["sourceset_${sourceSet.name}_classpath_annotation"] = storeSet(sourceSet.compileClasspath.files)
+ }
+ }
model.info["sourceset_${sourceSet.name}_configuration_compile"] = sourceSet.compileConfigurationName;
model.info["sourceset_${sourceSet.name}_configuration_runtime"] = sourceSet.runtimeConfigurationName;
}
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
index db8a44c..0453456 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectCache.java
@@ -96,7 +96,7 @@ public final class GradleProjectCache {
private static final Map<File, Set<File>> SUB_PROJECT_DIR_CACHE = new ConcurrentHashMap<>();
// Increase this number if new info is gathered from the projects.
- private static final int COMPATIBLE_CACHE_VERSION = 14;
+ private static final int COMPATIBLE_CACHE_VERSION = 15;
private GradleProjectCache() {
}
---------------------------------------------------------------------
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