From 52d09eb5ce885ca653cad83f3f7c0b9991326ce6 Mon Sep 17 00:00:00 2001
From: Shai Almog <67850168+shai-almog@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:08:16 +0300
Subject: [PATCH 1/3] Remove release workflow designer jar steps

---
 .github/workflows/designer.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/.github/workflows/designer.yml b/.github/workflows/designer.yml
index 68c07c6ca6..5c69b8c5de 100644
--- a/.github/workflows/designer.yml
+++ b/.github/workflows/designer.yml
@@ -45,3 +45,31 @@ jobs:
 
       - name: Run designer CSS localization tests
         run: xvfb-run -a ant -noinput -buildfile CodenameOneDesigner/build.xml test-css-localization
+
+      - name: Build designer release jar
+        run: xvfb-run -a ant -noinput -buildfile CodenameOneDesigner/build.xml release
+
+      - name: Verify designer CLI CSS compilation
+        run: |
+          tmp_dir="CodenameOneDesigner/tmp-cli-test"
+          css_file="$tmp_dir/test.css"
+          l10n_dir="$tmp_dir/localization"
+          output_file="$tmp_dir/output.res"
+          mkdir -p "$l10n_dir"
+          cat <<'EOF' > "$css_file"
+          #TestLabel {
+              color: rgb(255, 0, 0);
+          }
+          EOF
+          cat <<'EOF' > "$l10n_dir/Strings.properties"
+          greeting=Hello from CLI
+          EOF
+          xvfb-run -a java -Dcli=true -jar CodenameOneDesigner/dist/designer.jar \
+            -css -stateless -input "$css_file" -output "$output_file" -localization "$l10n_dir"
+          test -s "$output_file"
+
+      - name: Upload designer jar artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: designer-jar
+          path: CodenameOneDesigner/dist/designer.jar

From 26a306f1ed23480e09ec15c96405bcc191573dcc Mon Sep 17 00:00:00 2001
From: Shai Almog <67850168+shai-almog@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:39:45 +0300
Subject: [PATCH 2/3] Use upload-artifact v4 in designer workflow

---
 .github/workflows/designer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/designer.yml b/.github/workflows/designer.yml
index 5c69b8c5de..5b1b02a68c 100644
--- a/.github/workflows/designer.yml
+++ b/.github/workflows/designer.yml
@@ -69,7 +69,7 @@ jobs:
           test -s "$output_file"
 
       - name: Upload designer jar artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: designer-jar
           path: CodenameOneDesigner/dist/designer.jar

From 9f6a51fc1747423c4f5252411dc1f102f2603cbc Mon Sep 17 00:00:00 2001
From: Shai Almog <67850168+shai-almog@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:53:36 +0300
Subject: [PATCH 3/3] Include SVG port classes in designer release jar

---
 .github/workflows/designer.yml | 2 +-
 CodenameOneDesigner/build.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/designer.yml b/.github/workflows/designer.yml
index 5b1b02a68c..8f82d6c11d 100644
--- a/.github/workflows/designer.yml
+++ b/.github/workflows/designer.yml
@@ -57,7 +57,7 @@ jobs:
           output_file="$tmp_dir/output.res"
           mkdir -p "$l10n_dir"
           cat <<'EOF' > "$css_file"
-          #TestLabel {
+          Label {
               color: rgb(255, 0, 0);
           }
           EOF
diff --git a/CodenameOneDesigner/build.xml b/CodenameOneDesigner/build.xml
index c4316aedde..308158e9a5 100644
--- a/CodenameOneDesigner/build.xml
+++ b/CodenameOneDesigner/build.xml
@@ -143,9 +143,9 @@
       <copy file="../../cn1-binaries/designer/jaxb-api-2.2.3.jar" todir="dist/lib" />
       <copy file="../../cn1-binaries/designer/jaxb-impl-2.3.0.1.jar" todir="dist/lib" />
       <copy file="../Ports/JavaSE/dist/JavaSE.jar" todir="dist/lib" />
-      
+      <copy file="../Ports/JavaSEWithSVGSupport/dist/JavaSEWithSVGSupport.jar" todir="dist/lib" />
       <jar destfile="dist/tempJar.jar">
-        <zipgroupfileset dir="dist/lib" excludes="META-INF/**"/>          
+        <zipgroupfileset dir="dist/lib" excludes="META-INF/**"/>
       </jar>
       <jar destfile="dist/designer.jar" compress="false">
         <zipfileset src="dist/CodenameOneDesigner.jar" excludes="META-INF/**" />