From af08c1a6f65b2e2cd9e7db1cf37711af590171f0 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Nov 2020 19:42:25 +0900
Subject: [PATCH] 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
---
 .gitignore                                     | 2 ++
 .swift-version                                 | 2 +-
 Package.resolved                               | 6 +++---
 Package.swift                                  | 2 +-
 Sources/TokamakTestRenderer/TestRenderer.swift | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c205e57..5dfe99d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ DerivedData
 *.hmap
 *.ipa
 .swiftpm/xcode
+*.xcodeproj
 
 # Bundler
 .bundle
@@ -39,3 +40,4 @@ Pods/
 
 # SwiftPM
 .build
+/Packages
diff --git a/.swift-version b/.swift-version
index 2f4477f3..8fc00360 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-wasm-5.3-SNAPSHOT-2020-10-29-c
+wasm-5.3.0-RELEASE
diff --git a/Package.resolved b/Package.resolved
index 3067a1c8..4a9d5ec7 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -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"
         }
       },
       {
diff --git a/Package.swift b/Package.swift
index b4463396..012ff3f7 100644
--- a/Package.swift
+++ b/Package.swift
@@ -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
diff --git a/Sources/TokamakTestRenderer/TestRenderer.swift b/Sources/TokamakTestRenderer/TestRenderer.swift
index ea40377d..e768b25a 100644
--- a/Sources/TokamakTestRenderer/TestRenderer.swift
+++ b/Sources/TokamakTestRenderer/TestRenderer.swift
@@ -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
   }