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 64c489a9c6 Upgrade Gradle Tooling API to 7.5 with Java 18 Support
64c489a9c6 is described below
commit 64c489a9c66944c11dc5370b4785d0eb39ded2b6
Author: Laszlo Kishalmi <[email protected]>
AuthorDate: Thu Jul 14 13:58:10 2022 -0700
Upgrade Gradle Tooling API to 7.5 with Java 18 Support
---
.../src/org/netbeans/modules/gradle/api/execute/Bundle.properties | 1 +
.../org/netbeans/modules/gradle/api/execute/GradleCommandLine.java | 1 +
.../modules/gradle/api/execute/GradleDistributionManager.java | 1 +
extide/libs.gradle/external/binaries-list | 2 +-
...tooling-api-7.4-license.txt => gradle-tooling-api-7.5-license.txt} | 4 ++--
...e-tooling-api-7.4-notice.txt => gradle-tooling-api-7.5-notice.txt} | 0
extide/libs.gradle/manifest.mf | 2 +-
extide/libs.gradle/nbproject/project.properties | 2 +-
extide/libs.gradle/nbproject/project.xml | 2 +-
9 files changed, 9 insertions(+), 6 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/Bundle.properties
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/Bundle.properties
index 4934cf743a..ca3bcc51eb 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/Bundle.properties
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/Bundle.properties
@@ -60,6 +60,7 @@ REFRESH_DEPENDENCIES_DSC=<p>Refresh the state of
dependencies.</p>
REFRESH_KEYS_DSC=<p>Refresh the public keys used for dependency
verification.</p>
RERUN_TASKS_DSC=<p>Ignore previously cached task results.</p>
SCAN_DSC=<p>Creates a build scan.<br/>Gradle will emit a warning if the build
scan plugin has not been applied. (<a
href="https://gradle.com/build-scans">https://gradle.com/build-scans</a>)</p>
+SHOW_VERSION_DSC=<p>Print version info and continue.</p>
SETTINGS_FILE_DSC=<p>Specify the settings file.</p><b>[deprecated]</b>
STATUS_DSC=<p>Shows status of running and recently stopped Gradle
Daemon(s).</p>
STACKTRACE_DSC=<p>Print out the stacktrace for all exceptions.</p>
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
index 7124f862bd..df937eb4ab 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
@@ -146,6 +146,7 @@ public final class GradleCommandLine implements
Serializable {
REFRESH_KEYS(PARAM, GradleVersionRange.from("6.2"), "--refresh-keys"),
RERUN_TASKS(PARAM, "--rerun-tasks"),
SCAN(PARAM, GradleVersionRange.from("4.3"), "--scan"),
+ SHOW_VERSION(PARAM, GradleVersionRange.from("7.5"), "-V",
"--show-version"),
STACKTRACE(PARAM, "-s", "--stacktrace"),
STACKTRACE_FULL(PARAM, "-S", "--full-stacktrace"),
STATUS(UNSUPPORTED, "--status"),
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 1d27b0078a..6228015b2f 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
@@ -98,6 +98,7 @@ public final class GradleDistributionManager {
GradleVersion.version("6.7"), // JDK-15
GradleVersion.version("7.0"), // JDK-16
GradleVersion.version("7.3"), // JDK-17
+ GradleVersion.version("7.5"), // JDK-18
};
private static final int JAVA_VERSION;
diff --git a/extide/libs.gradle/external/binaries-list
b/extide/libs.gradle/external/binaries-list
index e625448311..26365ef594 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.
-38AAE423ABABA1AA6B0F885874EDE451D4B2D437
https://repo.gradle.org/public/org/gradle/gradle-tooling-api/7.4/gradle-tooling-api-7.4.jar
gradle-tooling-api-7.4.jar
+18FB51FF62486D84F7B91F171D0E4AABF020DCDC
https://repo.gradle.org/public/org/gradle/gradle-tooling-api/7.5/gradle-tooling-api-7.5.jar
gradle-tooling-api-7.5.jar
diff --git a/extide/libs.gradle/external/gradle-tooling-api-7.4-license.txt
b/extide/libs.gradle/external/gradle-tooling-api-7.5-license.txt
similarity index 99%
rename from extide/libs.gradle/external/gradle-tooling-api-7.4-license.txt
rename to extide/libs.gradle/external/gradle-tooling-api-7.5-license.txt
index 8007f695be..935c1ef782 100644
--- a/extide/libs.gradle/external/gradle-tooling-api-7.4-license.txt
+++ b/extide/libs.gradle/external/gradle-tooling-api-7.5-license.txt
@@ -1,7 +1,7 @@
Name: Gradle Wrapper
Description: Gradle Tooling API
-Version: 7.4
-Files: gradle-tooling-api-7.4.jar
+Version: 7.5
+Files: gradle-tooling-api-7.5.jar
License: Apache-2.0
Origin: Gradle Inc.
URL: https://gradle.org/
diff --git a/extide/libs.gradle/external/gradle-tooling-api-7.4-notice.txt
b/extide/libs.gradle/external/gradle-tooling-api-7.5-notice.txt
similarity index 100%
rename from extide/libs.gradle/external/gradle-tooling-api-7.4-notice.txt
rename to extide/libs.gradle/external/gradle-tooling-api-7.5-notice.txt
diff --git a/extide/libs.gradle/manifest.mf b/extide/libs.gradle/manifest.mf
index 8932f4dd4f..9cdebba871 100644
--- a/extide/libs.gradle/manifest.mf
+++ b/extide/libs.gradle/manifest.mf
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.libs.gradle/7
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/libs/gradle/Bundle.properties
-OpenIDE-Module-Specification-Version: 7.5
+OpenIDE-Module-Specification-Version: 7.5.0.1
diff --git a/extide/libs.gradle/nbproject/project.properties
b/extide/libs.gradle/nbproject/project.properties
index 26dd1fc936..a25cda055b 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-7.4.jar=modules/gradle/gradle-tooling-api.jar
+release.external/gradle-tooling-api-7.5.jar=modules/gradle/gradle-tooling-api.jar
diff --git a/extide/libs.gradle/nbproject/project.xml
b/extide/libs.gradle/nbproject/project.xml
index 934033794f..f770f33482 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-7.4.jar</binary-origin>
+
<binary-origin>external/gradle-tooling-api-7.5.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists