From 1217b240bf98eec711e793786f7e1803e7734221 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Mon, 11 Sep 2023 20:47:11 +0300 Subject: [PATCH 1/6] Update for next development version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 48a08f0..cd3f6db 100644 --- a/pom.xml +++ b/pom.xml @@ -5,10 +5,10 @@ 4.0.0 org.dominokit domino-cli - 2.0.0-RC2 + HEAD-SNAPSHOT HEAD-SNAPSHOT - 2.0.0-RC2 + 2.0.0-RC3 0.0.0-HEAD-SNAPSHOT 3.11.0 17 From 436eb0f5c096d957d59d478bb65d2437674bf98f Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Fri, 10 Nov 2023 13:43:53 +0300 Subject: [PATCH 2/6] update versions --- .../org/dominokit/cli/VersionProfile.java | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/java/org/dominokit/cli/VersionProfile.java b/src/main/java/org/dominokit/cli/VersionProfile.java index c76fc5d..347150e 100644 --- a/src/main/java/org/dominokit/cli/VersionProfile.java +++ b/src/main/java/org/dominokit/cli/VersionProfile.java @@ -12,7 +12,7 @@ public class VersionProfile { private final String templatesPath; private final List 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 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.5"), + 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.1"), + 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-RC4"), + 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.1"), + 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": return new VersionProfile(version, "v2", ToolVersion.of("domino_ui_version", "HEAD-SNAPSHOT"), ToolVersion.of("domino_history_version", "HEAD-SNAPSHOT"), @@ -78,6 +78,6 @@ private static VersionProfile get(String version){ ); } - 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]."); } } From cff7a6123c15baa14f7df7e2a7ef351a6f136646 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Thu, 16 Nov 2023 20:10:25 +0300 Subject: [PATCH 3/6] update to latest j2cl-m-p --- .../org/dominokit/cli/VersionProfile.java | 6 ++-- .../project/j2cl/J2clBasicProject.java | 3 -- .../v2/app/j2cl/basic/client/source/App.java | 5 ++-- .../j2cl/basic/client/source/App.native.js | 4 +-- .../j2cl/basic/client/source/EntryPoint.java | 28 ------------------- 5 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/EntryPoint.java diff --git a/src/main/java/org/dominokit/cli/VersionProfile.java b/src/main/java/org/dominokit/cli/VersionProfile.java index 347150e..3bf6749 100644 --- a/src/main/java/org/dominokit/cli/VersionProfile.java +++ b/src/main/java/org/dominokit/cli/VersionProfile.java @@ -50,7 +50,7 @@ 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") ); case "v2": return new VersionProfile(version, version, @@ -62,7 +62,7 @@ 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") ); case "dev": return new VersionProfile(version, "v2", @@ -74,7 +74,7 @@ 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") ); } diff --git a/src/main/java/org/dominokit/cli/generator/project/j2cl/J2clBasicProject.java b/src/main/java/org/dominokit/cli/generator/project/j2cl/J2clBasicProject.java index 86e0d71..7bb1364 100644 --- a/src/main/java/org/dominokit/cli/generator/project/j2cl/J2clBasicProject.java +++ b/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")) diff --git a/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/App.java b/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/App.java index ae2355d..eefab6f 100644 --- a/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/App.java +++ b/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 onModuleLoad(). */ -public class App implements EntryPoint { +@JsType +public class App { /** * This is the entry point method. diff --git a/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/App.native.js b/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/App.native.js index fcdf730..ccf6282 100644 --- a/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/App.native.js +++ b/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); diff --git a/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/EntryPoint.java b/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/EntryPoint.java deleted file mode 100644 index 07c5dd7..0000000 --- a/src/main/resources/projects-templates/v2/app/j2cl/basic/client/source/EntryPoint.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.google.gwt.core.client; - -/* - * #%L - * Connected - * %% - * Copyright (C) 2017 Vertispan - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -/** - * Created by colin on 9/16/17. - */ -public interface EntryPoint { - void onModuleLoad(); -} From 14118270160a13c5ce11ad7c7caea22d3ada4cb4 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Thu, 21 Dec 2023 09:03:29 +0300 Subject: [PATCH 4/6] update versions --- .../java/org/dominokit/cli/VersionProfile.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/dominokit/cli/VersionProfile.java b/src/main/java/org/dominokit/cli/VersionProfile.java index 3bf6749..cb9b26e 100644 --- a/src/main/java/org/dominokit/cli/VersionProfile.java +++ b/src/main/java/org/dominokit/cli/VersionProfile.java @@ -42,11 +42,11 @@ private static VersionProfile get(String version) { switch (version) { case "v1": return new VersionProfile(version, version, - ToolVersion.of("domino_ui_version", "1.0.5"), - ToolVersion.of("domino_history_version", "1.0.0"), + 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.0"), - ToolVersion.of("domino_jackson_version", "1.0.1"), + 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"), @@ -54,11 +54,11 @@ private static VersionProfile get(String version) { ); case "v2": return new VersionProfile(version, version, - ToolVersion.of("domino_ui_version", "2.0.0-RC4"), - ToolVersion.of("domino_history_version", "1.0.0"), + ToolVersion.of("domino_ui_version", "2.0.0-RC5"), + ToolVersion.of("domino_history_version", "1.0.1"), ToolVersion.of("domino_mvp_version", "2.0.0-RC2"), - ToolVersion.of("domino_rest_version", "1.0.0"), - ToolVersion.of("domino_jackson_version", "1.0.1"), + 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"), From e33b54bc44c70fdf755f985097ec14073bce0382 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Mon, 1 Jan 2024 18:19:27 +0300 Subject: [PATCH 5/6] update versions --- src/main/java/org/dominokit/cli/VersionProfile.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/dominokit/cli/VersionProfile.java b/src/main/java/org/dominokit/cli/VersionProfile.java index cb9b26e..361be77 100644 --- a/src/main/java/org/dominokit/cli/VersionProfile.java +++ b/src/main/java/org/dominokit/cli/VersionProfile.java @@ -55,9 +55,9 @@ private static VersionProfile get(String version) { case "v2": return new VersionProfile(version, version, ToolVersion.of("domino_ui_version", "2.0.0-RC5"), - ToolVersion.of("domino_history_version", "1.0.1"), + ToolVersion.of("domino_history_version", "1.0.3"), ToolVersion.of("domino_mvp_version", "2.0.0-RC2"), - ToolVersion.of("domino_rest_version", "1.0.1"), + 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"), From e6b1f43592715907e68ca871898feee9eb893fc8 Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Mon, 1 Jan 2024 18:19:44 +0300 Subject: [PATCH 6/6] Update versions for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cd3f6db..e6261b5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.dominokit domino-cli - HEAD-SNAPSHOT + 2.0.0-RC3 HEAD-SNAPSHOT 2.0.0-RC3