Skip to content

Commit 57d931b

Browse files
committed
Rename JavaScriptCore to JavaScript to support macOS
1 parent 1f7f7b4 commit 57d931b

File tree

9 files changed

+26
-9
lines changed

9 files changed

+26
-9
lines changed

Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ let package = Package(
1515
name: "JavaScript",
1616
products: [
1717
.library(
18-
name: "JavaScriptCore",
19-
targets: ["JavaScriptCore"])
18+
name: "JavaScript",
19+
targets: ["JavaScript"])
2020
],
2121
dependencies: [
2222
.package(
@@ -28,10 +28,10 @@ let package = Package(
2828
name: "CJavaScriptCore",
2929
dependencies: []),
3030
.target(
31-
name: "JavaScriptCore",
31+
name: "JavaScript",
3232
dependencies: ["CJavaScriptCore"]),
3333
.testTarget(
34-
name: "JavaScriptCoreTests",
35-
dependencies: ["Test", "JavaScriptCore"])
34+
name: "JavaScriptTests",
35+
dependencies: ["Test", "JavaScript"])
3636
]
3737
)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
* See CONTRIBUTORS.txt for the list of the project authors
99
*/
1010

11+
#if os(Linux)
1112
import CJavaScriptCore
13+
#else
14+
import JavaScriptCore
15+
#endif
16+
1217
import struct Foundation.URL
1318

1419
public class JSContext {
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
* See CONTRIBUTORS.txt for the list of the project authors
99
*/
1010

11+
#if os(Linux)
1112
import CJavaScriptCore
13+
#else
14+
import JavaScriptCore
15+
#endif
1216

1317
public struct JSError: Error, CustomStringConvertible {
1418
public var description: String
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
* See CONTRIBUTORS.txt for the list of the project authors
99
*/
1010

11+
#if os(Linux)
1112
import CJavaScriptCore
13+
#else
14+
import JavaScriptCore
15+
#endif
1216

1317
public class JSValue {
1418
let context: JSContextRef
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
* See CONTRIBUTORS.txt for the list of the project authors
99
*/
1010

11+
#if os(Linux)
1112
import CJavaScriptCore
13+
#else
14+
import JavaScriptCore
15+
#endif
1216

1317
public func JSValueToStringCopy(
1418
_ ctx: JSContextRef,

Tests/JavaScriptCoreTests/JSValueTests.swift renamed to Tests/JavaScriptTests/JSValueTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
import Test
12-
@testable import JavaScriptCore
12+
@testable import JavaScript
1313

1414
final class JSValueTests: TestCase {
1515
func testToInt() {

Tests/JavaScriptCoreTests/JavaScriptCoreTests.swift renamed to Tests/JavaScriptTests/JavaScriptTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
import Test
12-
@testable import JavaScriptCore
12+
@testable import JavaScript
1313

1414
final class JavaScriptCoreTests: TestCase {
1515
func testEvaluate() {
File renamed without changes.

Tests/LinuxMain.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import XCTest
22

3-
import JavaScriptCoreTests
3+
import JavaScriptTests
44

55
var tests = [XCTestCaseEntry]()
6-
tests += JavaScriptCoreTests.__allTests()
6+
tests += JavaScriptTests.__allTests()
77

88
XCTMain(tests)

0 commit comments

Comments
 (0)