From 0f3e91c2b1fd1f32eb8af4e1a2d186043330fa62 Mon Sep 17 00:00:00 2001
From: Akio Yasui <akkyie01@gmail.com>
Date: Fri, 20 Aug 2021 23:09:35 +0900
Subject: [PATCH 1/2] Revert "Merge pull request #41 from
 akkyie/use-github-actions"

This reverts commit ffbccdf59ccb3da4c203f0575a22c9926dad5f40, reversing
changes made to b43b1945209bac1be91503e9b2c2d719d287cb64.
---
 .github/workflows/test.yml                    | 33 -------
 Tablier.xcodeproj/project.pbxproj             | 12 ++-
 .../xcschemes/Tablier-Package.xcscheme        | 98 ++++++-------------
 3 files changed, 42 insertions(+), 101 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index e36bc43..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Test
-
-on: push
-
-jobs:
-  test_xcode:
-    strategy:
-      matrix:
-        include:
-          - os: macos-latest
-            swift: "~5.3"
-          - os: macos-11
-            swift: "~5.4"
-          - os: macos-11
-            swift: "~5.5"
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-      - run: make lint/xcode
-      - uses: mxcl/xcodebuild@v1
-        with:
-          swift: ${{ matrix.swift }}
-
-  test-spm:
-    strategy:
-      matrix:
-        swift: ["5.3", "5.4"]
-    runs-on: ubuntu-latest
-    container:
-      image: swift:${{ matrix.swift }}
-    steps:
-      - uses: actions/checkout@v2
-      - run: make test/spm
diff --git a/Tablier.xcodeproj/project.pbxproj b/Tablier.xcodeproj/project.pbxproj
index 59708f7..bc30df6 100644
--- a/Tablier.xcodeproj/project.pbxproj
+++ b/Tablier.xcodeproj/project.pbxproj
@@ -76,7 +76,7 @@
 		OBJ_28 /* Configs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Configs; sourceTree = SOURCE_ROOT; };
 		OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		OBJ_8 /* SwiftPM.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = SwiftPM.xcconfig; path = Configs/SwiftPM.xcconfig; sourceTree = "<group>"; };
-		"Tablier::Tablier::Product" /* Tablier.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Tablier.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		"Tablier::Tablier::Product" /* Tablier.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Tablier.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		"Tablier::TablierTests::Product" /* TablierTests.xctest */ = {isa = PBXFileReference; lastKnownFileType = file; path = TablierTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -347,8 +347,13 @@
 			baseConfigurationReference = OBJ_8 /* SwiftPM.xcconfig */;
 			buildSettings = {
 				ENABLE_TESTABILITY = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
+				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tablier.xcodeproj/Tablier_Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
@@ -367,8 +372,13 @@
 			baseConfigurationReference = OBJ_8 /* SwiftPM.xcconfig */;
 			buildSettings = {
 				ENABLE_TESTABILITY = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PLATFORM_DIR)/Developer/Library/Frameworks",
+				);
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tablier.xcodeproj/Tablier_Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) $(TOOLCHAIN_DIR)/usr/lib/swift/macosx";
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited)";
diff --git a/Tablier.xcodeproj/xcshareddata/xcschemes/Tablier-Package.xcscheme b/Tablier.xcodeproj/xcshareddata/xcschemes/Tablier-Package.xcscheme
index 8954022..d223b6e 100644
--- a/Tablier.xcodeproj/xcshareddata/xcschemes/Tablier-Package.xcscheme
+++ b/Tablier.xcodeproj/xcshareddata/xcschemes/Tablier-Package.xcscheme
@@ -1,69 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "9999"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Tablier::Tablier"
-               BuildableName = "Tablier.framework"
-               BlueprintName = "Tablier"
-               ReferencedContainer = "container:Tablier.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Tablier::TablierTests"
-               BuildableName = "TablierTests.xctest"
-               BlueprintName = "TablierTests"
-               ReferencedContainer = "container:Tablier.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
+<Scheme LastUpgradeVersion = "9999" version = "1.3">
+  <BuildAction parallelizeBuildables = "YES" buildImplicitDependencies = "YES">
+    <BuildActionEntries>
+      <BuildActionEntry buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" buildForArchiving = "YES" buildForAnalyzing = "YES">
+        <BuildableReference
+          BuildableIdentifier = "primary"
+          BuildableName = "'lib$(TARGET_NAME)'"
+          BlueprintName = "Tablier"
+          ReferencedContainer = "container:Tablier.xcodeproj">
+        </BuildableReference>
+      </BuildActionEntry>
+    </BuildActionEntries>
+  </BuildAction>
+  <TestAction
+    buildConfiguration = "Debug"
+    selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+    selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+    shouldUseLaunchSchemeArgsEnv = "YES"
+    codeCoverageEnabled = "YES">
+    <Testables>
+        <TestableReference
+          skipped = "NO">
+          <BuildableReference
+            BuildableIdentifier = "primary"
+            BuildableName = "'$(TARGET_NAME)'"
+            BlueprintName = "TablierTests"
+            ReferencedContainer = "container:Tablier.xcodeproj">
+          </BuildableReference>
+        </TestableReference>
+    </Testables>
+  </TestAction>
 </Scheme>

From 88d0afeeefb2442e79d3f121c3adc4b5ed6cf5c6 Mon Sep 17 00:00:00 2001
From: Akio Yasui <akkyie01@gmail.com>
Date: Fri, 20 Aug 2021 23:10:12 +0900
Subject: [PATCH 2/2] Use GitHub Actions

---
 .github/workflows/test.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..e36bc43
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,33 @@
+name: Test
+
+on: push
+
+jobs:
+  test_xcode:
+    strategy:
+      matrix:
+        include:
+          - os: macos-latest
+            swift: "~5.3"
+          - os: macos-11
+            swift: "~5.4"
+          - os: macos-11
+            swift: "~5.5"
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: make lint/xcode
+      - uses: mxcl/xcodebuild@v1
+        with:
+          swift: ${{ matrix.swift }}
+
+  test-spm:
+    strategy:
+      matrix:
+        swift: ["5.3", "5.4"]
+    runs-on: ubuntu-latest
+    container:
+      image: swift:${{ matrix.swift }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: make test/spm