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.
apache · Feb 5, 2024 · 57a3a31 · 57a3a31
1 parent 0c7c18d
commit 57a3a31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -488,7 +488,7 @@ public Set<FileObject> 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/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java b/....java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java
@@ -66,8 +66,6 @@ static void collectOperationsForType(Map<String, Object> 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<String, Object> params, TemplateOperati
         } else {
             // @TODO delete wrapper added by init?
         }
+
+        ops.addProjectPreload(root);
+        ops.addProjectPreload(new File(root, subFolder));
+
     }
 
 }