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 9bc649bac0 Upgrade Gradle Tooling API to 8.7 9bc649bac0 is described below commit 9bc649bac0bdd83d51a71cce80759252dd213b00 Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Sun Mar 31 09:40:35 2024 -0700 Upgrade Gradle Tooling API to 8.7 --- extide/gradle/apichanges.xml | 16 ++++++++ extide/gradle/manifest.mf | 2 +- .../nbproject/org-netbeans-modules-gradle.sig | 4 +- extide/gradle/nbproject/project.xml | 2 +- .../gradle/api/execute/GradleCommandLine.java | 4 +- .../api/execute/GradleDistributionManager.java | 2 +- .../gradle/spi/newproject/TemplateOperation.java | 46 +++++++++++++++++++++- extide/libs.gradle/external/binaries-list | 2 +- ...ense.txt => gradle-tooling-api-8.7-license.txt} | 4 +- ...otice.txt => gradle-tooling-api-8.7-notice.txt} | 0 extide/libs.gradle/manifest.mf | 2 +- extide/libs.gradle/nbproject/project.properties | 2 +- extide/libs.gradle/nbproject/project.xml | 2 +- 13 files changed, 75 insertions(+), 13 deletions(-) diff --git a/extide/gradle/apichanges.xml b/extide/gradle/apichanges.xml index 946a17b5c5..72ff79bef6 100644 --- a/extide/gradle/apichanges.xml +++ b/extide/gradle/apichanges.xml @@ -83,6 +83,22 @@ is the proper place. <!-- ACTUAL CHANGES BEGIN HERE: --> <changes> + <change id="gradle-init-javaversion"> + <api name="general"/> + <summary>Gradle InitOperation now Supports --java-version and --comments flags</summary> + <version major="2" minor="40"/> + <date day="31" month="3" year="2024"/> + <author login="lkishalmi"/> + <compatibility semantic="compatible" addition="yes"/> + <description> + <p> + Added <code>comments(Boolean comments)</code> and <code>javaVersion(String version)</code> to + <a href="@TOP@/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.InitOperation.html">TemplateOperation.InitOperation</a> + allowing more detailed project creation. + </p> + </description> + <class package="org.netbeans.modules.gradle.spi.newproject" name="TemplateOperation"/> + </change> <change id="gradle-report-severity"> <api name="general"/> <summary>Gradle project problems have severity and stacktraces</summary> diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf index 9eb04c0d0a..4588b852e9 100644 --- a/extide/gradle/manifest.mf +++ b/extide/gradle/manifest.mf @@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: true OpenIDE-Module: org.netbeans.modules.gradle/2 OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties -OpenIDE-Module-Specification-Version: 2.39 +OpenIDE-Module-Specification-Version: 2.40 diff --git a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig index 86da56daf6..195048149f 100644 --- a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig +++ b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 2.38 +#Version 2.40 CLSS public abstract interface java.io.Serializable @@ -1100,7 +1100,9 @@ hcls BaseOperationStep,ConfigureProjectStep,CopyFromFileTemplate,CopyFromTemplat CLSS public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation outer org.netbeans.modules.gradle.spi.newproject.TemplateOperation meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation basePackage(java.lang.String) +meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation comments(java.lang.Boolean) meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation dsl(java.lang.String) +meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation javaVersion(java.lang.String) meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation projectName(java.lang.String) meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation testFramework(java.lang.String) meth public final void add() diff --git a/extide/gradle/nbproject/project.xml b/extide/gradle/nbproject/project.xml index 47e0d7e2e7..7a4f37f85e 100644 --- a/extide/gradle/nbproject/project.xml +++ b/extide/gradle/nbproject/project.xml @@ -100,7 +100,7 @@ <compile-dependency/> <run-dependency> <release-version>8</release-version> - <specification-version>8.0.1</specification-version> + <specification-version>8.7</specification-version> </run-dependency> </dependency> <dependency> 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 9b61766af6..9fbe14cb08 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 @@ -135,7 +135,7 @@ public final class GradleCommandLine implements Serializable { NO_CONFIGURE_ON_DEMAND(PARAM, "--no-configure-on-demand"), NO_DAEMON(UNSUPPORTED, "--no-daemon"), NO_PARALLEL(PARAM, "--no-parallel"), - NO_REBUILD(PARAM, GradleVersionRange.until("8.0"), "-a", "--no-rebuild"), + NO_REBUILD(PARAM, "-a", "--no-rebuild"), NO_SCAN(PARAM, GradleVersionRange.from("4.3"), "--no-scan"), NO_SEARCH_UPWARD(UNSUPPORTED, GradleVersionRange.until("5.0"), "--no-search-upward", "-u"), NO_WATCH_FS(PARAM, GradleVersionRange.from("6.7"), "--no-watch-fs"), @@ -143,7 +143,7 @@ public final class GradleCommandLine implements Serializable { PARALLEL(PARAM, "--parallel"), PROFILE(PARAM, "--profile"), RECOMPILE_SCRIPTS(UNSUPPORTED, GradleVersionRange.until("5.0"), "--recompile-scripts"), - REFRESH_DEPENDENCIES(PARAM, "--refresh-dependencies"), + REFRESH_DEPENDENCIES(PARAM, "-U", "--refresh-dependencies"), REFRESH_KEYS(PARAM, GradleVersionRange.from("6.2"), "--refresh-keys"), RERUN_TASKS(PARAM, "--rerun-tasks"), SCAN(PARAM, GradleVersionRange.from("4.3"), "--scan"), 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 8075eb7a5a..024f95a670 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 @@ -103,7 +103,7 @@ public final class GradleDistributionManager { GradleVersion.version("8.5"), // JDK-21 }; - private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.6"); //NOI18N + private static final GradleVersion LAST_KNOWN_GRADLE = GradleVersion.version("8.7"); //NOI18N final File gradleUserHome; diff --git a/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java index 9e2b98e1d8..68f38956a8 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java @@ -64,7 +64,8 @@ import org.openide.util.Exceptions; import org.openide.util.NbBundle; /** - * + * Steps, that a New Gradle Project Wizard can perform. + * * @author Laszlo Kishalmi */ public final class TemplateOperation implements Runnable { @@ -236,6 +237,21 @@ public final class TemplateOperation implements Runnable { * @since 2.20 */ public abstract InitOperation projectName(String name); + + /** Specify the Java version the project would be compiled, tested, + * and executed with. + * @param version the Java version to be used + * @return this builder to chain the calls. + * @since 2.40 + */ + public abstract InitOperation javaVersion(String version); + + /** Specify whether create comments in the generated files. + * @param comments set {@code false} to generate more compact project files. + * @return this builder to chain the calls. + * @since 2.40 + */ + public abstract InitOperation comments(Boolean comments); } private final class InitStep extends InitOperation implements OperationStep { @@ -245,6 +261,8 @@ public final class TemplateOperation implements Runnable { private String testFramework; private String basePackage; private String projectName; + private String javaVersion; + private Boolean comments; InitStep(File target, String type) { this.target = target; @@ -315,6 +333,20 @@ public final class TemplateOperation implements Runnable { args.add(projectName); } + // --java-version 21 + if (javaVersion != null) { + args.add("--java-version"); + args.add(javaVersion); + } + + if (comments != null) { + args.add(comments ? "--comments" : "--no-comments"); + } + + // gradle init is non-interactive inside the IDE + args.add("--use-defaults"); + + if (GradleSettings.getDefault().isOffline()) { pconn.newBuild().withArguments("--offline").forTasks(args.toArray(new String[0])).run(); //NOI18N } else { @@ -326,6 +358,18 @@ public final class TemplateOperation implements Runnable { gconn.disconnect(); return Collections.singleton(FileUtil.toFileObject(target)); } + + @Override + public InitOperation javaVersion(String version) { + this.javaVersion = version; + return this; + } + + @Override + public InitOperation comments(Boolean comments) { + this.comments = comments; + return this; + } } public void copyFromFile(String templateName, File target, Map<String, ? extends Object> tokens) { diff --git a/extide/libs.gradle/external/binaries-list b/extide/libs.gradle/external/binaries-list index cbb0dffff9..2e58f89b85 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. -1B1A733327BD5EFE9813DD0590C21865C0EDC954 https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.6/gradle-tooling-api-8.6.jar gradle-tooling-api-8.6.jar +5F48B9BB9099B900FC33864A3794F31C439D9F73 https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.7/gradle-tooling-api-8.7.jar gradle-tooling-api-8.7.jar diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.6-license.txt b/extide/libs.gradle/external/gradle-tooling-api-8.7-license.txt similarity index 99% rename from extide/libs.gradle/external/gradle-tooling-api-8.6-license.txt rename to extide/libs.gradle/external/gradle-tooling-api-8.7-license.txt index c854552b26..84a9de902f 100644 --- a/extide/libs.gradle/external/gradle-tooling-api-8.6-license.txt +++ b/extide/libs.gradle/external/gradle-tooling-api-8.7-license.txt @@ -1,7 +1,7 @@ Name: Gradle Tooling API Description: Gradle Tooling API -Version: 8.6 -Files: gradle-tooling-api-8.6.jar +Version: 8.7 +Files: gradle-tooling-api-8.7.jar License: Apache-2.0 Origin: Gradle Inc. URL: https://gradle.org/ diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.6-notice.txt b/extide/libs.gradle/external/gradle-tooling-api-8.7-notice.txt similarity index 100% rename from extide/libs.gradle/external/gradle-tooling-api-8.6-notice.txt rename to extide/libs.gradle/external/gradle-tooling-api-8.7-notice.txt diff --git a/extide/libs.gradle/manifest.mf b/extide/libs.gradle/manifest.mf index 0a6f67abde..861c4ca455 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/8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/libs/gradle/Bundle.properties -OpenIDE-Module-Specification-Version: 8.6 +OpenIDE-Module-Specification-Version: 8.7 diff --git a/extide/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties index 7f82ab4f46..6cd0e22d83 100644 --- a/extide/libs.gradle/nbproject/project.properties +++ b/extide/libs.gradle/nbproject/project.properties @@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial # Sigtest fails to read the classes in the gradle-tooling-api sigtest.skip.gen=true -release.external/gradle-tooling-api-8.6.jar=modules/gradle/gradle-tooling-api.jar +release.external/gradle-tooling-api-8.7.jar=modules/gradle/gradle-tooling-api.jar diff --git a/extide/libs.gradle/nbproject/project.xml b/extide/libs.gradle/nbproject/project.xml index 6b668eb39f..dc58e80a45 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.6.jar</binary-origin> + <binary-origin>external/gradle-tooling-api-8.7.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