Merge pull request #19 from danpalmer/main

Fix build and version

Author: marcprux

.github/workflows/ci.yml

@@ -2,51 +2,46 @@ name: JXKit CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
     branches:
-      - '*'
-  schedule:
-    # run at 9AM & 9PM UTC
-    - cron:  '0 9,21 * * *'
-
-env:
-  DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+      - "*"
+  workflow_dispatch:
 
 jobs:
   linux:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get update
       - name: Install dependencies
-        run: sudo apt-get install -y libjavascriptcoregtk-4.0-dev
-      - run: pkg-config --libs javascriptcoregtk-4.0
+        run: sudo apt-get install -y libjavascriptcoregtk-4.1-dev
+      - run: pkg-config --libs javascriptcoregtk-4.1
       - uses: actions/checkout@v2
       - name: Test (Debug)
         run: swift test --configuration debug
       - name: Test (Release)
         run: swift test --configuration release -Xswiftc -enable-testing
 
   ios:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
       - name: Test (Debug)
-        run: xcodebuild clean test -configuration Debug -scheme "JXKit" -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 14 Pro" 
+        run: xcodebuild clean test -configuration Debug -scheme "JXKit" -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 16 Pro"
       - name: Test (Release)
-        run: xcodebuild clean test -configuration Release -scheme "JXKit" -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 14 Pro" 
+        run: xcodebuild clean test -configuration Release -scheme "JXKit" -sdk "iphonesimulator" -destination "platform=iOS Simulator,name=iPhone 16 Pro"
 
   tvos:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
       - name: Test (Debug)
-        run: xcodebuild clean test -configuration Debug -scheme "JXKit" -sdk "appletvsimulator" -destination "platform=tvOS Simulator,name=Apple TV" 
+        run: xcodebuild clean test -configuration Debug -scheme "JXKit" -sdk "appletvsimulator" -destination "platform=tvOS Simulator,name=Apple TV"
       - name: Test (Release)
-        run: xcodebuild clean test -configuration Release -scheme "JXKit" -sdk "appletvsimulator" -destination "platform=tvOS Simulator,name=Apple TV" 
+        run: xcodebuild clean test -configuration Release -scheme "JXKit" -sdk "appletvsimulator" -destination "platform=tvOS Simulator,name=Apple TV"
 
   macos:
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
       - name: Test (Debug)
@@ -55,7 +50,7 @@ jobs:
         run: swift test --configuration release -Xswiftc -enable-testing
 
   api-doc:
-    runs-on: macos-12 # needed to be able to document SwiftUI
+    runs-on: macos-latest
     timeout-minutes: 20
     steps:
       - uses: actions/checkout@v2
@@ -79,6 +74,4 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: '.'
-
-
+          publish_dir: "."

Package.swift

@@ -22,8 +22,8 @@ let targets: [Target] = [
 #else // No native JavaScriptCore falls back to javascriptcoregtk
 let targets: [Target] = [
     .systemLibrary(name: "CJSCore", 
-        pkgConfig: "javascriptcoregtk-4.0", 
-        providers: [.apt(["libjavascriptcoregtk-4.0-dev"]), .yum(["webkit2gtk"])]),
+        pkgConfig: "javascriptcoregtk-4.1", 
+        providers: [.apt(["libjavascriptcoregtk-4.1-dev"]), .yum(["webkit2gtk"])]),
     .target(name: "JXKit", dependencies: ["CJSCore"], resources: [.process("Resources")])
 ]
 #endif

Sources/CJSCore/include/jscore_c.h

@@ -1,4 +1,4 @@
 #ifndef jscore_c_h
 #define jscore_c_h
-#include <webkitgtk-4.0/JavaScriptCore/JavaScript.h>
+#include <webkitgtk-4.1/JavaScriptCore/JavaScript.h>
 #endif

Sources/CJSCore/include/module.modulemap

@@ -1,5 +1,5 @@
 module CJSCore [system] [extern_c] {
-    umbrella header "/usr/include/webkitgtk-4.0/JavaScriptCore/JavaScript.h"
-    link "javascriptcoregtk-4.0"
+    umbrella header "/usr/include/webkitgtk-4.1/JavaScriptCore/JavaScript.h"
+    link "javascriptcoregtk-4.1"
     export *
 }

Sources/CJSCore/module.modulemap

@@ -1,6 +1,6 @@
 module CJSCore {
     header "include/jscore_c.h"
-    link "javascriptcoregtk-4.0"
+    link "javascriptcoregtk-4.1"
     export *
 }
 

Tests/JXKitTests/JXCoreTests.swift

@@ -396,7 +396,7 @@ class JXCoreTests: XCTestCase {
         XCTAssertEqual(try lint("Math.PIE.x"), "TypeError: undefined is not an object (evaluating \'Math.PIE.x\') <<script: Math.PIE.x >>")
         XCTAssertEqual(try lint("1X"), "SyntaxError: No identifiers allowed directly after numeric literal <<script: 1X >>")
         XCTAssertEqual(try lint("1["), "SyntaxError: Unexpected end of script <<script: 1[ >>")
-        XCTAssertEqual(try lint("1]"), "SyntaxError: Unexpected token \']\'. Parse error. <<script: 1] >>")
+        XCTAssertEqual(try lint("1]"), "SyntaxError: Unexpected token \']\' <<script: 1] >>")
 
         // Strict checks
 

Tests/JXKitTests/JXKitTests.swift

@@ -48,12 +48,7 @@ final class JXKitTests: XCTestCase {
         XCTAssertEqual("65.4", try jxc.eval("new Intl.NumberFormat('en-IN', { maximumSignificantDigits: 3 }).format(65.4321)").string)
 
         let yen = "new Intl.NumberFormat('ja-JP', { style: 'currency', currency: 'JPY' }).format(45.678)"
-        // I'm guessing these are different values because they use combining marks differently
-#if os(Linux)
-        XCTAssertEqual("￥46", try jxc.eval(yen).string)
-#else
         XCTAssertEqual("¥46", try jxc.eval(yen).string)
-#endif
 
         XCTAssertEqual("10/24/2022", try jxc.eval("new Intl.DateTimeFormat('en-US', {timeZone: 'UTC'}).format(new Date('2022-10-24'))").string)
         XCTAssertEqual("24/10/2022", try jxc.eval("new Intl.DateTimeFormat('fr-FR', {timeZone: 'UTC'}).format(new Date('2022-10-24'))").string)