Skip to content

Commit fe811d4

Browse files
committed
Backport NB patch for Gradle tooling 8.10 upgrade
This version of Gradle brings full JDK23 support. - Manually verified `shasum` of the gradle-tooling-api-8.10.jar recorded in the *extide/libs.gradle/external/binaries-list* file. - Especially important since this PR is still not approved. - BA available. Signed-off-by: Siddharth Srinivasan <[email protected]>
1 parent e4b4427 commit fe811d4

File tree

2 files changed

+84
-0
lines changed

2 files changed

+84
-0
lines changed

build.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
patches/7621.diff
5050
patches/7641.diff
5151
patches/7654.diff
52+
patches/7690.diff
5253
patches/mvn-sh.diff
5354
patches/generate-dependencies.diff
5455
patches/rename-debugger.diff

patches/7690.diff

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
2+
index 8b93f19d3208..051d95a2cb8b 100644
3+
--- a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
4+
+++ b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
5+
@@ -100,9 +100,10 @@ public final class GradleDistributionManager {
6+
GradleVersion.version("8.3"), // JDK-20
7+
GradleVersion.version("8.5"), // JDK-21
8+
GradleVersion.version("8.8"), // JDK-22
9+
+ GradleVersion.version("8.10"),// JDK-23
10+
};
11+
12+
- private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.9"); //NOI18N
13+
+ private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.10"); //NOI18N
14+
15+
final File gradleUserHome;
16+
17+
diff --git a/extide/libs.gradle/external/binaries-list b/extide/libs.gradle/external/binaries-list
18+
index dff2c2265b37..72218b9d5a29 100644
19+
--- a/extide/libs.gradle/external/binaries-list
20+
+++ b/extide/libs.gradle/external/binaries-list
21+
@@ -15,4 +15,4 @@
22+
# specific language governing permissions and limitations
23+
# under the License.
24+
25+
-7BCC4423C529A42ECA9D0CE5B5275369EF4DF55A https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.9/gradle-tooling-api-8.9.jar gradle-tooling-api-8.9.jar
26+
+1FC754376876B11AE26D811F8812AA37773660DD https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.10/gradle-tooling-api-8.10.jar gradle-tooling-api-8.10.jar
27+
diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.9-license.txt b/extide/libs.gradle/external/gradle-tooling-api-8.10-license.txt
28+
similarity index 99%
29+
rename from extide/libs.gradle/external/gradle-tooling-api-8.9-license.txt
30+
rename to extide/libs.gradle/external/gradle-tooling-api-8.10-license.txt
31+
index 74cb1addb8d6..ab7d5a2a2558 100644
32+
--- a/extide/libs.gradle/external/gradle-tooling-api-8.9-license.txt
33+
+++ b/extide/libs.gradle/external/gradle-tooling-api-8.10-license.txt
34+
@@ -1,7 +1,7 @@
35+
Name: Gradle Tooling API
36+
Description: Gradle Tooling API
37+
-Version: 8.9
38+
-Files: gradle-tooling-api-8.9.jar
39+
+Version: 8.10
40+
+Files: gradle-tooling-api-8.10.jar
41+
License: Apache-2.0
42+
Origin: Gradle Inc.
43+
URL: https://gradle.org/
44+
diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.9-notice.txt b/extide/libs.gradle/external/gradle-tooling-api-8.10-notice.txt
45+
similarity index 100%
46+
rename from extide/libs.gradle/external/gradle-tooling-api-8.9-notice.txt
47+
rename to extide/libs.gradle/external/gradle-tooling-api-8.10-notice.txt
48+
diff --git a/extide/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties
49+
index 6e4605fe4922..d20b5a229d4c 100644
50+
--- a/extide/libs.gradle/nbproject/project.properties
51+
+++ b/extide/libs.gradle/nbproject/project.properties
52+
@@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
53+
# Sigtest fails to read the classes in the gradle-tooling-api
54+
sigtest.skip.gen=true
55+
56+
-release.external/gradle-tooling-api-8.9.jar=modules/gradle/gradle-tooling-api.jar
57+
+release.external/gradle-tooling-api-8.10.jar=modules/gradle/gradle-tooling-api.jar
58+
diff --git a/extide/libs.gradle/nbproject/project.xml b/extide/libs.gradle/nbproject/project.xml
59+
index d82027b5e615..9b1dfe36f2ad 100644
60+
--- a/extide/libs.gradle/nbproject/project.xml
61+
+++ b/extide/libs.gradle/nbproject/project.xml
62+
@@ -39,7 +39,7 @@
63+
</public-packages>
64+
<class-path-extension>
65+
<runtime-relative-path>gradle/gradle-tooling-api.jar</runtime-relative-path>
66+
- <binary-origin>external/gradle-tooling-api-8.9.jar</binary-origin>
67+
+ <binary-origin>external/gradle-tooling-api-8.10.jar</binary-origin>
68+
</class-path-extension>
69+
</data>
70+
</configuration>
71+
diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java
72+
index 255def8bce12..031c25128452 100644
73+
--- a/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java
74+
+++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/Wizards.java
75+
@@ -35,7 +35,7 @@ public final class Wizards {
76+
77+
private Wizards() {};
78+
79+
- private static final List<Integer> JAVA_VERSIONS = List.of(22, 21, 17, 11, 8);
80+
+ private static final List<Integer> JAVA_VERSIONS = List.of(23, 22, 21, 17, 11, 8);
81+
private static final List<TestFramework> JAVA_TEST_FRAMEWORKS = List.of(
82+
JUNIT,
83+
JUNIT_5,

0 commit comments

Comments
 (0)