Xcode compatibility (#297)

* Ignore xcodeproj generated by SwiftPM

* Update to use official OpenCombine to avoid Xcode build error

* Use forked version with ObservableObject implementation

* Fix ambigious error

* Ignore SwiftPM edit mode package

* Update toolchain version
This commit is contained in:
Yuta Saito 2020-11-08 19:42:25 +09:00 committed by GitHub
parent 9681b91a84
commit af08c1a6f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions

2
.gitignore vendored
View File

@ -19,6 +19,7 @@ DerivedData
*.hmap
*.ipa
.swiftpm/xcode
*.xcodeproj
# Bundler
.bundle
@ -39,3 +40,4 @@ Pods/
# SwiftPM
.build
/Packages

View File

@ -1 +1 @@
wasm-5.3-SNAPSHOT-2020-10-29-c
wasm-5.3.0-RELEASE

View File

@ -12,11 +12,11 @@
},
{
"package": "OpenCombine",
"repositoryURL": "https://github.com/MaxDesiatov/OpenCombine.git",
"repositoryURL": "https://github.com/TokamakUI/OpenCombine.git",
"state": {
"branch": null,
"revision": "29ab27e488a1c9afef217b1435b3293d4a77b1ae",
"version": "0.0.1"
"revision": "4977ca158f19738f0cd420a1e5668712f4e28709",
"version": "0.12.0-alpha1"
}
},
{

View File

@ -42,7 +42,7 @@ let package = Package(
.upToNextMinor(from: "0.8.0")
),
.package(url: "https://github.com/MaxDesiatov/Runtime.git", from: "2.1.2"),
.package(url: "https://github.com/MaxDesiatov/OpenCombine.git", from: "0.0.1"),
.package(url: "https://github.com/TokamakUI/OpenCombine.git", from: "0.12.0-alpha2"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define

View File

@ -24,7 +24,7 @@ import TokamakCore
public func testScheduler(closure: @escaping () -> ()) {
#if os(WASI)
let fn = JSClosure { _ in
let fn = JSClosure { _ -> JSValue in
closure()
return .undefined
}