Updating the frontend application template in 12.5 to work with Gradle 7.0

java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk

@@ -51,8 +51,8 @@ if (!jdk8) {
 </#noparse>
 dependencies {
     implementation commonProject
-    implementation "org.netbeans.html:net.java.html.boot:1.6.1"
-    implementation "com.dukescript.api:javafx.beaninfo:0.5"
+    implementation "org.netbeans.html:net.java.html.boot:1.7.2"
+    implementation "com.dukescript.api:javafx.beaninfo:0.6"
     runtimeOnly "com.dukescript.api:javafx.base:8.60.11"
-    runtimeOnly "org.netbeans.html:net.java.html.boot.fx:1.6.1"
+    runtimeOnly "org.netbeans.html:net.java.html.boot.fx:1.7.2"
 }

java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk

@@ -18,9 +18,9 @@
     under the License.
 
 -->
-action.run.args=bck2brwsrShow
+action.run.args=bck2brwsrShow -t
 
 action.debug.args=run --debug-jvm
 
 action.custom-1=Run in Browser
-action.custom-1.args=bck2brwsrShow
+action.custom-1.args=bck2brwsrShow -t

java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml

@@ -44,13 +44,6 @@
                     <file name="settings.gradle" url="settings.gradle.fmk">
                         <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
                     </file>
-                    <folder name="gradle">
-                        <folder name="wrapper">
-                            <file name="gradle-wrapper.properties" url="gradle-wrapper.properties.fmk">
-                                <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
-                            </file>
-                        </folder>
-                    </folder>
                     <folder name="app">
                         <file name="build.gradle" url="app_build.gradle.fmk">
                             <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
@@ -110,6 +103,7 @@
                                         <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
                                     </file>
                                     <file name="index.html" url="src_main_webapp_pages_index.html.fmk">
+                                        <attr name="important" boolvalue="true"/>
                                         <attr name="javax.script.ScriptEngine" stringvalue="freemarker"/>
                                     </file>
                                 </folder>

java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk

@@ -18,15 +18,14 @@
     under the License.
 
 -->
-<#noparse>
-plugins {
-    id "me.tatarka.retrolambda" version "3.7.1"
-}
-
 apply plugin: 'java'
-
-group 'com.dukescript.demo'
-version '1.0-SNAPSHOT'
+<#if group?has_content>
+group '${group}'
+</#if>
+<#if version?has_content>
+version '${version}'
+</#if>
+<#noparse>
 
 allprojects {
     repositories {
@@ -38,9 +37,10 @@ targetCompatibility = '1.8'
 sourceCompatibility = '1.8'
 
 dependencies {
-    implementation "org.netbeans.html:net.java.html.json:1.6.1"
+    implementation "org.netbeans.html:net.java.html.json:1.7.2"
     implementation "com.dukescript.api:javafx.base:8.60.11"
-    implementation "com.dukescript.api:javafx.beaninfo:0.5"
-    runtimeOnly "org.netbeans.html:ko4j:1.6.1"
+    implementation "com.dukescript.api:javafx.beaninfo:0.6"
+    annotationProcessor "com.dukescript.api:javafx.beaninfo:0.6"
+    runtimeOnly "org.netbeans.html:ko4j:1.7.2"
 }
 </#noparse>

java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk

@@ -30,31 +30,20 @@ import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import static net.java.html.json.Models.applyBindings;
 
-public final class Demo implements FXBeanInfo.Provider {
-    private final StringProperty desc = new SimpleStringProperty(this, "desc", "Buy Milk");
-    private final ListProperty<String> todos = new SimpleListProperty<>(this, "todos", FXCollections.observableArrayList());
-    private final IntegerBinding numTodos = Bindings.createIntegerBinding(todos::size, todos);
+@FXBeanInfo.Generate
+public final class Demo extends DemoBeanInfo {
+    final StringProperty desc = new SimpleStringProperty(this, "desc", "");
+    final ListProperty<String> todos = new SimpleListProperty<>(this, "todos", FXCollections.observableArrayList());
+    final IntegerBinding numTodos = Bindings.createIntegerBinding(todos::size, todos);
 
     void addTodo() {
         todos.getValue().add(desc.getValue());
         desc.setValue("");
     }
 
-    private final FXBeanInfo info = FXBeanInfo.newBuilder(this)
-            .property(desc)
-            .property(todos)
-            .property("numTodos", numTodos)
-            .action("addTodo", this::addTodo)
-            .build();
-
-    @Override
-    public FXBeanInfo getFXBeanInfo() {
-        return info;
-    }
-
     public static void onPageLoad() {
         Demo model = new Demo();
+        model.desc.setValue("Try Java in browser @ " + System.currentTimeMillis());
         applyBindings(model);
     }
-
 }

java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk

@@ -19,13 +19,11 @@
 
 -->
 buildscript {
-    ext.bck2brwsr_version = '0.31'
-
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:$bck2brwsr_version"
+        classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:0.51"
     }
 }
 
@@ -47,11 +45,6 @@ dependencies {
     runtimeOnly "com.dukescript.api:javafx.base:8.60.11"
 }
 
-configurations.bck2brwsr {
-    exclude group: 'org.jetbrains', module: 'annotations'
-    extendsFrom configurations.runtimeClasspath
-}
-
 bck2brwsrPages.from {
     fileTree("${commonProject.projectDir}/src/main/webapp/pages")
 }