Merge pull request #5 from StarryInternet/carthage-improvements

Update carthage-compatible project to use one multiplatform framework target

Author: klundberg

.github/workflows/ci.yml

@@ -2,38 +2,39 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
     paths:
-      - '**.swift'
-      - '**.podspec'
-      - '.github/workflows/*'
+      - "**.swift"
+      - "**.podspec"
+      - ".github/workflows/*"
   pull_request:
-    branches: [ master ]
+    branches: [master]
     paths:
-      - '**.swift'
-      - '**.podspec'
-      - '.github/workflows/*'
+      - "**.swift"
+      - "**.podspec"
+      - ".github/workflows/*"
 
 jobs:
   build-mac:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: swift build
-    - name: Run tests
-      run: swift test
-    - name: Pod lint
-      run: pod lib lint --quick
+      - uses: actions/checkout@v2
+      - name: Build
+        run: swift build
+      - name: Run tests
+        run: swift test
+      - name: Pod lint
+        run: pod lib lint --quick
+      - name: Verify Carthage
+        run: carthage build --no-skip-current --verbose --use-xcframeworks --platform macOS
 
-  
   build-ios:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: |
-        swift build -Xswiftc "-sdk" \
-         -Xswiftc `xcrun --sdk iphonesimulator --show-sdk-path` \
-         -Xswiftc "-target" \
-         -Xswiftc "x86_64-apple-ios`xcrun --show-sdk-version --sdk iphonesimulator`-simulator"
+      - uses: actions/checkout@v2
+      - name: Build
+        run: |
+          swift build -Xswiftc "-sdk" \
+           -Xswiftc `xcrun --sdk iphonesimulator --show-sdk-path` \
+           -Xswiftc "-target" \
+           -Xswiftc "x86_64-apple-ios`xcrun --show-sdk-version --sdk iphonesimulator`-simulator"

.gitignore

@@ -2,4 +2,5 @@
 /.build
 /Packages
 xcuserdata
-.swiftpm
+.swiftpm
+/Carthage

CombineCoreBluetooth.xcodeproj/project.pbxproj

@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EB443F8D27C6BCA70005CCEA"
                BuildableName = "CombineCoreBluetooth.framework"
-               BlueprintName = "CombineCoreBluetooth iOS"
+               BlueprintName = "CombineCoreBluetooth"
                ReferencedContainer = "container:CombineCoreBluetooth.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -33,8 +33,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EB443FD827C6C1940005CCEA"
-               BuildableName = "CombineCoreBluetooth iOS Tests.xctest"
-               BlueprintName = "CombineCoreBluetooth iOS Tests"
+               BuildableName = "CombineCoreBluetooth Tests.xctest"
+               BlueprintName = "CombineCoreBluetooth Tests"
                ReferencedContainer = "container:CombineCoreBluetooth.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -62,7 +62,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EB443F8D27C6BCA70005CCEA"
             BuildableName = "CombineCoreBluetooth.framework"
-            BlueprintName = "CombineCoreBluetooth iOS"
+            BlueprintName = "CombineCoreBluetooth"
             ReferencedContainer = "container:CombineCoreBluetooth.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

CombineCoreBluetooth.xcodeproj/xcshareddata/xcschemes/CombineCoreBluetooth macOS.xcscheme

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>