Merge pull request #19 from wayfair/swift-5.1-support

Swift 5.1 things

.github/workflows/main.yml

@@ -7,15 +7,15 @@ jobs:
     steps:
       - uses: actions/[email protected]
       - name: xcodebuild
-        run: xcodebuild -project Prelude.xcodeproj -scheme "Prelude macOS" -destination "platform=OS X,arch=x86_64" build test | xcpretty
+        run: xcodebuild -project Prelude.xcodeproj -scheme "Prelude-Package" -destination "platform=OS X,arch=x86_64" build test | xcpretty
       - name: SwiftPM Build
         run: swift build
   test-iOS:
     runs-on: macOS-latest
     steps:
       - uses: actions/[email protected]
       - name: xcodebuild
-        run: xcodebuild -project Prelude.xcodeproj -scheme "Prelude iOS" -destination "platform=iOS Simulator,OS=13.1,name=iPhone 11" build test | xcpretty
+        run: xcodebuild -project Prelude.xcodeproj -scheme "Prelude-Package" -destination "platform=iOS Simulator,OS=13.3,name=iPhone 11" build test | xcpretty
   test-linux:
     runs-on: ubuntu-latest
     container:

.gitignore

@@ -35,3 +35,7 @@ Carthage/
 # Jazzy
 #
 .docs/
+
+# macOS
+#
+.DS_Store

Makefile

@@ -0,0 +1,20 @@
+.PHONY: default clean swiftbuild swifttest sync_linuxmain sync_xcodeproj test
+
+default: sync_linuxmain sync_xcodeproj swiftbuild
+
+clean:
+	swift package clean
+
+swiftbuild:
+	swift build
+
+swifttest: sync_linuxmain
+	swift test
+
+sync_linuxmain:
+	swift test --generate-linuxmain
+
+sync_xcodeproj: 
+	swift package generate-xcodeproj
+
+test: swifttest

Package.swift

@@ -1,28 +1,30 @@
-// swift-tools-version:4.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
+// swift-tools-version:5.1
 
 import PackageDescription
 
 let package = Package(
     name: "Prelude",
+    // Products define the executables and libraries produced by a package, and make them visible to other packages.
     products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "Prelude",
-            targets: ["Prelude"])
+            targets: ["Prelude"]
+        )
     ],
+    // Dependencies declare other packages that this package depends on.
+    // .package(url: /* package url */, from: "1.0.0"),
     dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
     ],
+    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+    // Targets can depend on other targets in this package, and on products in packages which this package depends on.
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "Prelude",
-            dependencies: []),
+            dependencies: []
+        ),
         .testTarget(
             name: "PreludeTests",
-            dependencies: ["Prelude"])
+            dependencies: ["Prelude"]
+        )
     ]
 )

Example/Prelude.playground/contents.xcplayground → Prelude.playground/contents.xcplayground

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='6.0' target-platform='ios'>
+<playground version='6.0' target-platform='macos'>
     <pages>
         <page name='change-tracking'/>
         <page name='prelude'/>

Prelude.xcodeproj/PreludeTests_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

Prelude.xcodeproj/Prelude_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>