update to javascriptcoregtk-4.0

SusanDoggie · Apr 5, 2020 · df42474 · df42474
1 parent 84d2315
commit df42474
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.travis/before-install-swift b/.travis/before-install-swift
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e
 
-apt-get -y install libjavascriptcoregtk-1.0-dev
+apt-get -y install libjavascriptcoregtk-4.0-dev
diff --git a/Package.swift b/Package.swift
@@ -43,7 +43,7 @@ targets.append(
             "CJSCore",
         ],
         cSettings: [
-            .unsafeFlags(["-I/usr/include/webkitgtk-1.0"]),
+            .unsafeFlags(["-I/usr/include/webkitgtk-4.0"]),
         ]
     )
 )

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ A cross platform Javascript engine for Swift.
 
 For Ubuntu, you need to install JavaScriptCore
 
-    apt-get -y install libjavascriptcoregtk-1.0-dev
+    apt-get -y install libjavascriptcoregtk-4.0-dev
 
 ## Contributing
 

diff --git a/Sources/CJSCore/include/module.modulemap b/Sources/CJSCore/include/module.modulemap
@@ -1,5 +1,5 @@
 module CJSCore [system] [extern_c] {
-    umbrella header "/usr/include/webkitgtk-1.0/JavaScriptCore/JavaScript.h"
-    link "javascriptcoregtk-1.0"
+    umbrella header "/usr/include/webkitgtk-4.0/JavaScriptCore/JavaScript.h"
+    link "javascriptcoregtk-4.0"
     export *
 }
diff --git a/Sources/SwiftJS/JSArrayBuffer.swift b/Sources/SwiftJS/JSArrayBuffer.swift
@@ -27,6 +27,12 @@
 
 import JavaScriptCore
 
+#else
+
+import CJSCore
+
+#endif
+
 extension JSObject {
 
     /// Creates a JavaScript `ArrayBuffer` object.
@@ -91,5 +97,3 @@ extension JSObject {
     }
 
 }
-
-#endif