From 57a3a31f934c95e6e5213c3c02afbe1476ef3f82 Mon Sep 17 00:00:00 2001 From: Neil C Smith Date: Mon, 5 Feb 2024 11:50:07 +0000 Subject: [PATCH] Ensure Gradle new project picks up latest Gradle version for wrapper where intended. Trigger project load after wrapper is configured. Remove --offline flag from wrapper initialization. --- .../modules/gradle/spi/newproject/TemplateOperation.java | 2 +- .../java/newproject/SimpleApplicationProjectWizard.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 733ea533eb5e..57d55c4b4197 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 @@ -488,7 +488,7 @@ public Set execute() { args.add("--gradle-version"); //NOI18N args.add(version); } - pconn.newBuild().withArguments("--offline").forTasks(args.toArray(new String[0])).run(); //NOI18N + pconn.newBuild().forTasks(args.toArray(new String[0])).run(); //NOI18N } catch (GradleConnectionException | IllegalStateException ex) { // Well for some reason we were not able to load Gradle. // Ignoring that for now diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java index 33235fc27cd1..de1889f6504d 100644 --- a/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java +++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java @@ -66,8 +66,6 @@ static void collectOperationsForType(Map params, TemplateOperati final File root = new File(loc, name); ops.createGradleInit(root, type).basePackage(packageBase).projectName(name).dsl("groovy").add(); // NOI18N - ops.addProjectPreload(root); - ops.addProjectPreload(new File(root, subFolder)); Boolean initWrapper = (Boolean) params.get(PROP_INIT_WRAPPER); if (initWrapper == null || initWrapper) { @@ -76,6 +74,10 @@ static void collectOperationsForType(Map params, TemplateOperati } else { // @TODO delete wrapper added by init? } + + ops.addProjectPreload(root); + ops.addProjectPreload(new File(root, subFolder)); + } }