Git-ignore .swiftpm/ directory (pointfreeco#54)

* Git-ignore .swiftpm/ directory * Update ci.yml * Update ci.yml * Update ci.yml * Update ci.yml * Update Makefile * Update Makefile * Update Makefile * wip * wip * Update ci.yml * Update ci.yml * fix
finestructure · Sep 12, 2022 · d81cd16 · d81cd16
1 parent 11ccf4c
commit d81cd16
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 143 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,27 +11,18 @@ on:
 
 jobs:
   macos:
-    name: MacOS (Xcode ${{ matrix.xcode }}${{ matrix.experimental-build-system && ', experimental build system' || '' }})
-    runs-on: macOS-11.0
+    name: macOS (Xcode ${{ matrix.xcode }})
+    runs-on: macOS-12
     strategy:
       matrix:
         xcode:
-          - '12.4'
-          - '12.5.1'
-          - '13.0'
-          - '13.1'
-          - '13.2.1'
-        experimental-build-system: [false]
-        include:
-          - xcode: '13.2.1'
-            experimental-build-system: true
+          - '13.3.1'
+          - '13.4.1'
+          - '14.0'
     steps:
       - uses: actions/checkout@v2
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
-      - name: Enable Experimental Build System
-        if: ${{ matrix.experimental-build-system }}
-        run: defaults write com.apple.dt.XCBuild EnableSwiftBuildSystemIntegration 1
       - name: Print Swift version
         run: swift --version
       - name: Run tests (Swift)
@@ -53,20 +44,14 @@ jobs:
       - name: Run tests
         run: make test-linux SWIFT_VERSION=${{ matrix.swift }}
 
-  windows:
-    name: Windows
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        swift:
-          #- 5.3
-          - 5.4
-          - 5.5
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Swift & Run tests
-        uses: MaxDesiatov/swift-windows-action@v1
-        with:
-          shell-action: swift test && swift build --configuration release
-          swift-version: ${{ matrix.swift }}
+  #windows:
+  #  name: Windows
+  #  runs-on: windows-latest
+  #  steps:
+  #    - uses: compnerd/gha-setup-swift@main
+  #      with:
+  #        branch: swift-5.5-release
+  #        tag: 5.5-RELEASE
+  #
+  #    - uses: actions/checkout@v2
+  #    - run: swift test && swift build --configuration release
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 /.build
+/.swiftpm
 /Packages
 /*.xcodeproj
 xcuserdata/

diff --git a/.spi.yml b/.spi.yml
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/swift-custom-dump.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/swift-custom-dump.xcscheme
diff --git a/CustomDump.xcworkspace/contents.xcworkspacedata b/CustomDump.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/CustomDump.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CustomDump.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "xctest-dynamic-overlay",
+        "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
+        "state": {
+          "branch": null,
+          "revision": "38bc9242e4388b80bd23ddfdf3071428859e3260",
+          "version": "0.4.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/...ata/xcschemes/CustomDump_watchOS.xcscheme → ...cshareddata/xcschemes/CustomDump.xcscheme b/...ata/xcschemes/CustomDump_watchOS.xcscheme → ...cshareddata/xcschemes/CustomDump.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,6 +28,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CustomDumpTests"
+               BuildableName = "CustomDumpTests"
+               BlueprintName = "CustomDumpTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/Makefile b/Makefile
@@ -1,8 +1,7 @@
 PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
 PLATFORM_MACOS = macOS
 PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
-PLATFORM_TVOS = tvOS Simulator,name=Apple TV 4K (at 1080p)
-PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 4 - 44mm
+PLATFORM_TVOS = tvOS Simulator,name=Apple TV
 SWIFT_VERSION = 5.5
 ifeq ($(SWIFT_VERSION),5.3)
 SWIFT_BUILD_ARGS = --enable-test-discovery
@@ -25,44 +24,54 @@ test-swift:
 
 test-platforms:
 	xcodebuild test \
-		-scheme swift-custom-dump \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-destination platform="$(PLATFORM_IOS)"
 	xcodebuild \
-		-scheme swift-custom-dump \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-configuration Release \
 		-destination platform="$(PLATFORM_IOS)"
 
 	xcodebuild test \
-		-scheme swift-custom-dump \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-destination platform="$(PLATFORM_MACOS)"
 	xcodebuild \
-		-scheme swift-custom-dump \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-configuration Release \
 		-destination platform="$(PLATFORM_MACOS)"
 
 	xcodebuild test \
-		-scheme swift-custom-dump \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-destination platform="$(PLATFORM_MAC_CATALYST)"
 	xcodebuild \
-		-scheme swift-custom-dump \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-configuration Release \
 		-destination platform="$(PLATFORM_MAC_CATALYST)"
 
 	xcodebuild test \
-		-scheme swift-custom-dump \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-destination platform="$(PLATFORM_TVOS)"
 	xcodebuild \
-		-scheme swift-custom-dump \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-configuration Release \
 		-destination platform="$(PLATFORM_TVOS)"
 
 	xcodebuild \
-		-scheme CustomDump_watchOS \
-		-destination platform="$(PLATFORM_WATCHOS)"
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
+		-destination generic/platform=watchOS
 	xcodebuild \
-		-scheme CustomDump_watchOS \
+		-workspace CustomDump.xcworkspace \
+		-scheme CustomDump \
 		-configuration Release \
-		-destination platform="$(PLATFORM_WATCHOS)"
+		-destination generic/platform=watchOS
 
 format:
 	swift format --in-place --recursive .

diff --git a/Tests/CustomDumpTests/Conformances/UIKitTests.swift b/Tests/CustomDumpTests/Conformances/UIKitTests.swift
@@ -1,4 +1,4 @@
-#if canImport(UIKit)
+#if canImport(UIKit) && !os(watchOS)
   import CustomDump
   import XCTest
   import UIKit