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 edb1d8e008 Upgraded Gradle Tooling to 8.1-rc-2 with JDK 20 Support
edb1d8e008 is described below
commit edb1d8e008c10f73e57f4d60e806b442e574a87a
Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com>
AuthorDate: Thu Mar 30 16:16:25 2023 -0700
Upgraded Gradle Tooling to 8.1-rc-2 with JDK 20 Support
---
.../modules/gradle/api/execute/GradleDistributionManager.java | 5 ++++-
extide/libs.gradle/external/binaries-list | 2 +-
...-8.0-rc-1-license.txt => gradle-tooling-api-8.1-rc-2-license.txt} | 4 ++--
...pi-8.0-rc-1-notice.txt => gradle-tooling-api-8.1-rc-2-notice.txt} | 4 ++--
extide/libs.gradle/nbproject/project.properties | 2 +-
extide/libs.gradle/nbproject/project.xml | 2 +-
6 files changed, 11 insertions(+), 8 deletions(-)
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
index 28ec81b85a..96d972734c 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
@@ -99,6 +99,7 @@ public final class GradleDistributionManager {
GradleVersion.version("7.3"), // JDK-17
GradleVersion.version("7.5"), // JDK-18
GradleVersion.version("7.6"), // JDK-19
+ GradleVersion.version("8.1"), // JDK-20
};
final File gradleUserHome;
@@ -500,7 +501,9 @@ public final class GradleDistributionManager {
*/
public int lastSupportedJava() {
int i = JDK_COMPAT.length - 1;
- while ((i >= 0) && version.compareTo(JDK_COMPAT[i]) < 0) {
+ //Make sure that even RC-s are considered to be compatible.
+ GradleVersion baseVersion = version.getBaseVersion();
+ while ((i >= 0) && baseVersion.compareTo(JDK_COMPAT[i]) < 0) {
i--;
}
return i + 9;
diff --git a/extide/libs.gradle/external/binaries-list
b/extide/libs.gradle/external/binaries-list
index f65a3e12be..d5d8652419 100644
--- a/extide/libs.gradle/external/binaries-list
+++ b/extide/libs.gradle/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-21A1F0E6F9FB1A08D06602737FF2010288F9E934
https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.0-rc-1/gradle-tooling-api-8.0-rc-1.jar
gradle-tooling-api-8.0-rc-1.jar
+9BDE23C249C496F22A15B6202219170C5BCEF825
https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.1-rc-2/gradle-tooling-api-8.1-rc-2.jar
gradle-tooling-api-8.1-rc-2.jar
diff --git
a/extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-license.txt
b/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt
similarity index 99%
rename from extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-license.txt
rename to extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt
index f616b4a769..6c71fd7075 100644
--- a/extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-license.txt
+++ b/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt
@@ -1,7 +1,7 @@
Name: Gradle Wrapper
Description: Gradle Tooling API
-Version: 8.0-rc-1
-Files: gradle-tooling-api-8.0-rc-1.jar
+Version: 8.1-rc-2
+Files: gradle-tooling-api-8.1-rc-2.jar
License: Apache-2.0
Origin: Gradle Inc.
URL: https://gradle.org/
diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-notice.txt
b/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-notice.txt
similarity index 73%
rename from extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-notice.txt
rename to extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-notice.txt
index c8fac0a5a4..cb6a8aa687 100644
--- a/extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-notice.txt
+++ b/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-notice.txt
@@ -1,8 +1,8 @@
Gradle Inc.'s Gradle Tooling API
-Copyright 2007-2022 Gradle Inc.
+Copyright 2007-2023 Gradle Inc.
This product includes software developed at
Gradle Inc. (https://gradle.org/).
This product includes/uses SLF4J (https://www.slf4j.org/)
-developed by QOS.ch, 2004-2022
+developed by QOS.ch, 2004-2023
diff --git a/extide/libs.gradle/nbproject/project.properties
b/extide/libs.gradle/nbproject/project.properties
index 41aa7d08a1..98f01b2184 100644
--- a/extide/libs.gradle/nbproject/project.properties
+++ b/extide/libs.gradle/nbproject/project.properties
@@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
# For more information, please see http://wiki.netbeans.org/SignatureTest
sigtest.gen.fail.on.error=false
-release.external/gradle-tooling-api-8.0-rc-1.jar=modules/gradle/gradle-tooling-api.jar
+release.external/gradle-tooling-api-8.1-rc-2.jar=modules/gradle/gradle-tooling-api.jar
diff --git a/extide/libs.gradle/nbproject/project.xml
b/extide/libs.gradle/nbproject/project.xml
index 03b4e0a53a..3940a19b1c 100644
--- a/extide/libs.gradle/nbproject/project.xml
+++ b/extide/libs.gradle/nbproject/project.xml
@@ -39,7 +39,7 @@
</public-packages>
<class-path-extension>
<runtime-relative-path>gradle/gradle-tooling-api.jar</runtime-relative-path>
-
<binary-origin>external/gradle-tooling-api-8.0-rc-1.jar</binary-origin>
+
<binary-origin>external/gradle-tooling-api-8.1-rc-2.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
