Merge branch 'release/2.0.0-RC3'

pom.xml

@@ -5,10 +5,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dominokit</groupId>
     <artifactId>domino-cli</artifactId>
-    <version>2.0.0-RC2</version>
+    <version>2.0.0-RC3</version>
     <properties>
         <snapshot.version>HEAD-SNAPSHOT</snapshot.version>
-        <next.release.version>2.0.0-RC2</next.release.version>
+        <next.release.version>2.0.0-RC3</next.release.version>
         <release.version>0.0.0-HEAD-SNAPSHOT</release.version>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
         <maven.compiler.release>17</maven.compiler.release>

src/main/java/org/dominokit/cli/VersionProfile.java

@@ -12,7 +12,7 @@ public class VersionProfile {
     private final String templatesPath;
     private final List<ToolVersion> toolsVersions = new ArrayList<>();
 
-    public VersionProfile(String version,String templatesPath,  ToolVersion... toolVersions) {
+    public VersionProfile(String version, String templatesPath, ToolVersion... toolVersions) {
         this.version = version;
         this.templatesPath = templatesPath;
         this.toolsVersions.addAll(Arrays.asList(toolVersions));
@@ -30,41 +30,41 @@ public List<ToolVersion> getToolsVersions() {
         return toolsVersions;
     }
 
-    public static void setVersion(String version){
+    public static void setVersion(String version) {
         INSTANCE = get(version);
     }
 
-    public static VersionProfile get(){
+    public static VersionProfile get() {
         return INSTANCE;
     }
 
-    private static VersionProfile get(String version){
-        switch (version){
-        case "v1" :
-            return new VersionProfile(version, version,
-                    ToolVersion.of("domino_ui_version", "1.0.2"),
-                    ToolVersion.of("domino_history_version", "1.0.0"),
-                    ToolVersion.of("domino_mvp_version", "1.0.0"),
-                    ToolVersion.of("domino_rest_version", "1.0.0"),
-                    ToolVersion.of("domino_jackson_version", "1.0.0"),
-                    ToolVersion.of("quarkus_version", "2.16.7.Final"),
-                    ToolVersion.of("vertx_version", "3.9.4"),
-                    ToolVersion.of("gwt_version", "2.10.0"),
-                    ToolVersion.of("j2cl_maven_plugin_version", "0.21")
-                    );
-        case "v2" :
-            return new VersionProfile(version, version,
-                    ToolVersion.of("domino_ui_version", "2.0.0-RC3"),
-                    ToolVersion.of("domino_history_version", "1.0.0"),
-                    ToolVersion.of("domino_mvp_version", "2.0.0-RC2"),
-                    ToolVersion.of("domino_rest_version", "1.0.0"),
-                    ToolVersion.of("domino_jackson_version", "1.0.0"),
-                    ToolVersion.of("quarkus_version", "2.16.7.Final"),
-                    ToolVersion.of("vertx_version", "3.9.4"),
-                    ToolVersion.of("gwt_version", "2.10.0"),
-                    ToolVersion.of("j2cl_maven_plugin_version", "0.21")
-                    );
-            case "dev" :
+    private static VersionProfile get(String version) {
+        switch (version) {
+            case "v1":
+                return new VersionProfile(version, version,
+                        ToolVersion.of("domino_ui_version", "1.0.6"),
+                        ToolVersion.of("domino_history_version", "1.0.1"),
+                        ToolVersion.of("domino_mvp_version", "1.0.0"),
+                        ToolVersion.of("domino_rest_version", "1.0.1"),
+                        ToolVersion.of("domino_jackson_version", "1.0.4"),
+                        ToolVersion.of("quarkus_version", "2.16.7.Final"),
+                        ToolVersion.of("vertx_version", "3.9.4"),
+                        ToolVersion.of("gwt_version", "2.10.0"),
+                        ToolVersion.of("j2cl_maven_plugin_version", "0.21.0")
+                );
+            case "v2":
+                return new VersionProfile(version, version,
+                        ToolVersion.of("domino_ui_version", "2.0.0-RC5"),
+                        ToolVersion.of("domino_history_version", "1.0.3"),
+                        ToolVersion.of("domino_mvp_version", "2.0.0-RC2"),
+                        ToolVersion.of("domino_rest_version", "1.0.2"),
+                        ToolVersion.of("domino_jackson_version", "1.0.4"),
+                        ToolVersion.of("quarkus_version", "2.16.7.Final"),
+                        ToolVersion.of("vertx_version", "3.9.4"),
+                        ToolVersion.of("gwt_version", "2.10.0"),
+                        ToolVersion.of("j2cl_maven_plugin_version", "0.21.0")
+                );
+            case "dev":
                 return new VersionProfile(version, "v2",
                         ToolVersion.of("domino_ui_version", "HEAD-SNAPSHOT"),
                         ToolVersion.of("domino_history_version", "HEAD-SNAPSHOT"),
@@ -74,10 +74,10 @@ private static VersionProfile get(String version){
                         ToolVersion.of("quarkus_version", "2.16.7.Final"),
                         ToolVersion.of("vertx_version", "3.9.4"),
                         ToolVersion.of("gwt_version", "2.10.0"),
-                        ToolVersion.of("j2cl_maven_plugin_version", "0.21")
+                        ToolVersion.of("j2cl_maven_plugin_version", "0.21.0")
                 );
 
         }
-        throw new IllegalArgumentException("Invalid versions profile ["+version+"] use one of [v1, v2, dev].");
+        throw new IllegalArgumentException("Invalid versions profile [" + version + "] use one of [v1, v2, dev].");
     }
 }

src/main/java/org/dominokit/cli/generator/project/j2cl/J2clBasicProject.java

@@ -23,9 +23,6 @@ public void create(Project project){
                                                 .add(new TemplatedFile("App.java", "/app/j2cl/basic/client/source/App.java"))
                                                 .add(new TemplatedFile("App.native.js", "/app/j2cl/basic/client/source/App.native.js"))
                                         )
-                                        .add(new Package("com.google.gwt.core.client")
-                                                .add(new TemplatedFile("EntryPoint.java", "/app/j2cl/basic/client/source/EntryPoint.java"))
-                                        )
                                 )
                                 .add(new Folder("webapp/WEB-INF")
                                         .add(new TemplatedFile("web.xml", "/app/j2cl/basic/server/webapp/web.xml"))

src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/App.java

@@ -1,15 +1,16 @@
 package ${rootPackage};
 
-import com.google.gwt.core.client.EntryPoint;
 import elemental2.dom.DomGlobal;
 import elemental2.dom.HTMLDivElement;
 import elemental2.dom.HTMLHeadingElement;
+import jsinterop.annotations.JsType;
 import jsinterop.base.Js;
 
 /**
  * Entry point classes define <code>onModuleLoad()</code>.
  */
-public class App implements EntryPoint {
+@JsType
+public class App {
 
     /**
      * This is the entry point method.

src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/App.native.js

@@ -25,8 +25,8 @@ setTimeout(function(){
   // Call the java "constructor" method, `new` will only work if it is a @JsType, or maybe
   // once optimized. Without this, in BUNDLE mode, `new` doesn't include the clinit, so
   // static imports haven't been resolved yet.
-  var ep = App.$create__();
+  var ep = new App();
   // Invoke onModuleLoad to start the app.
-  ep.m_onModuleLoad__()
+  ep.onModuleLoad()
 }, 0);