From 2a5437de0c7d266c32ef5adcef36f1a46ff247ff Mon Sep 17 00:00:00 2001
From: Geert Bevin <gbevin@uwyn.com>
Date: Sun, 1 Oct 2023 09:29:15 -0400
Subject: [PATCH] Updated for latest RIFE2 core. Some build changes. Run Github
 workflow on macOS.

---
 .github/workflows/bld.yml                     | 26 +++++++++++++++++++
 core                                          |  2 +-
 src/bld/java/rife/BldBuild.java               |  3 ++-
 .../rife/bld/operations/JavacOptions.java     |  2 +-
 .../rife/bld/operations/JavadocOptions.java   |  8 +++---
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
index b69e2a9..91fdcf0 100644
--- a/.github/workflows/bld.yml
+++ b/.github/workflows/bld.yml
@@ -110,3 +110,29 @@ jobs:
           -Dtest.postgres=true -Dtest.mysql=true -Dtest.mariadb=true -Dtest.oracle=true -Dtest.oracle-free=true
           -DtestsBadgeUrl=https://rife2.com/tests-badge/update/com.uwyn.rife2/bld
           -DtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}
+
+  build-bld-project-macos:
+    runs-on: macos-latest
+
+    strategy:
+      matrix:
+        java-version: [ 17, 20 ]
+
+    steps:
+      - name: Checkout source repository
+        uses: actions/checkout@v4
+        with:
+          clean: true
+          submodules: 'true'
+          fetch-depth: 0
+
+      - name: Set up JDK ${{ matrix.java-version }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: ${{ matrix.java-version }}
+          check-latest: true
+
+      - name: Run tests
+        run: >-
+          ./bld clean download compile test
diff --git a/core b/core
index e6872e1..0ad243b 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit e6872e1c927662eb5156700c6d81b483b75e383b
+Subproject commit 0ad243b95e76bb506e625822a0f7ef9d03733f71
diff --git a/src/bld/java/rife/BldBuild.java b/src/bld/java/rife/BldBuild.java
index 8626a87..9a0ed51 100644
--- a/src/bld/java/rife/BldBuild.java
+++ b/src/bld/java/rife/BldBuild.java
@@ -56,7 +56,8 @@ public class BldBuild extends AbstractRife2Build {
             .mainSourceDirectories(antlr4Operation.outputDirectory(), core_src_main_java_directory)
             .testSourceDirectories(core_src_test_java_directory)
             .compileOptions()
-                .debuggingInfo(JavacOptions.DebuggingInfo.ALL);
+                .debuggingInfo(JavacOptions.DebuggingInfo.ALL)
+                .addAll(List.of("-encoding", "UTF-8"));
 
         jarOperation()
             .sourceDirectories(core_src_main_resources_directory)
diff --git a/src/main/java/rife/bld/operations/JavacOptions.java b/src/main/java/rife/bld/operations/JavacOptions.java
index be02dc4..bc2412f 100644
--- a/src/main/java/rife/bld/operations/JavacOptions.java
+++ b/src/main/java/rife/bld/operations/JavacOptions.java
@@ -78,7 +78,7 @@ public class JavacOptions extends ArrayList<String> {
      */
     public JavacOptions encoding(String name) {
         add("-encoding");
-        add("name");
+        add(name);
         return this;
     }
 
diff --git a/src/main/java/rife/bld/operations/JavadocOptions.java b/src/main/java/rife/bld/operations/JavadocOptions.java
index 5b16f64..dcc25ca 100644
--- a/src/main/java/rife/bld/operations/JavadocOptions.java
+++ b/src/main/java/rife/bld/operations/JavadocOptions.java
@@ -100,7 +100,7 @@ public class JavadocOptions extends ArrayList<String> {
      */
     public JavadocOptions doclet(String className) {
         add("-doclet");
-        add("className");
+        add(className);
         return this;
     }
 
@@ -112,7 +112,7 @@ public class JavadocOptions extends ArrayList<String> {
      */
     public JavadocOptions docletPath(String path) {
         add("-docletpath");
-        add("path");
+        add(path);
         return this;
     }
 
@@ -135,7 +135,7 @@ public class JavadocOptions extends ArrayList<String> {
      */
     public JavadocOptions encoding(String name) {
         add("-encoding");
-        add("name");
+        add(name);
         return this;
     }
 
@@ -213,7 +213,7 @@ public class JavadocOptions extends ArrayList<String> {
      */
     public JavadocOptions locale(String name) {
         add("-locale");
-        add("name");
+        add(name);
         return this;
     }