feat: add 7.4 support

lgdd · Apr 28, 2021 · 6a5f448 · 6a5f448
1 parent 4cc8a3b
commit 6a5f448
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Dockerfile.jvm b/Dockerfile.jvm
@@ -50,8 +50,8 @@ USER node
 WORKDIR /home/node/
 RUN curl -sSL https://raw.githubusercontent.com/liferay/liferay-blade-cli/master/cli/installers/local | sh
 ENV PATH "$PATH:/home/node/jpm/bin"
-RUN blade version && \
-    blade update
+RUN jpm remove blade && \
+    jpm install https://repository.liferay.com/nexus/content/repositories/liferay-public-snapshots/com/liferay/blade/com.liferay.blade.cli/4.0.8-SNAPSHOT/com.liferay.blade.cli-4.0.8-20210427.171152-5.jar
 
 RUN npm i -g yarn \
     && yarn global add yo

diff --git a/Dockerfile.native b/Dockerfile.native
@@ -42,8 +42,8 @@ USER node
 WORKDIR /home/node/
 RUN curl -sSL https://raw.githubusercontent.com/liferay/liferay-blade-cli/master/cli/installers/local | sh
 ENV PATH "$PATH:/home/node/jpm/bin"
-RUN blade version && \
-    blade update
+RUN jpm remove blade && \
+    jpm install https://repository.liferay.com/nexus/content/repositories/liferay-public-snapshots/com/liferay/blade/com.liferay.blade.cli/4.0.8-SNAPSHOT/com.liferay.blade.cli-4.0.8-20210427.171152-5.jar
 
 RUN npm i -g yarn \
     && yarn global add yo

diff --git a/src/main/frontend/src/Main.elm b/src/main/frontend/src/Main.elm
@@ -59,7 +59,8 @@ tools =
 
 versions : List String
 versions =
-    [ "dxp-7.3-sp1"
+    [ "portal-7.4-ga1"
+    , "dxp-7.3-sp1"
     , "dxp-7.2-sp4"
     , "dxp-7.1-sp5"
     , "dxp-7.0-sp15"

diff --git a/src/main/java/com/github/lgdd/liferay/starter/LiferayStarterResource.java b/src/main/java/com/github/lgdd/liferay/starter/LiferayStarterResource.java
@@ -77,6 +77,7 @@ private boolean validateWorkspaceParams(String tool, String version, LiferayWork
     var projectArtifactId = workspace.getProjectArtifactId();
     var projectVersion = workspace.getProjectVersion();
     var liferayVersions = Arrays.asList(
+        "portal-7.4-ga1",
         "dxp-7.3-sp1",
         "dxp-7.2-sp4",
         "dxp-7.1-sp5",

diff --git a/src/main/java/com/github/lgdd/liferay/starter/util/StringUtil.java b/src/main/java/com/github/lgdd/liferay/starter/util/StringUtil.java
@@ -58,7 +58,7 @@ public static String getThemeArtifactId(String themeName) {
   public static String getLiferayVersionNumber(String liferayProductVersion)
       throws UnsupportedLiferayVersionException {
 
-    for (String version : Arrays.asList("7.0", "7.1", "7.2", "7.3")) {
+    for (String version : Arrays.asList("7.0", "7.1", "7.2", "7.3", "7.4")) {
       if (liferayProductVersion.contains(version)) {
         return version;
       }