Introduce SPM (Swift Package Manager) support

This involved running the `swift package init` command, followed by performing some `git mv` commands to move the test and framework code, removing some unneeded files afterwards, running `swift package generate-xcodeproj` and renaming the tests directory to Tests. I also had to add a Tests/LinuxMain.swift and add entries to the Tests/UInt128Tests/UInt128Tests.swift files to make sure that testing can happen on a Linux workstation without much hassle.
Jitsusama · May 29, 2017 · 5609245 · 5609245
1 parent 84195d8
commit 5609245
Show file tree

Hide file tree

Showing 16 changed files with 315 additions and 436 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,10 @@
 .DS_Store
 # Unimportant user state files from XCode
 *.xcuserstate
+xcuserdata
 # Vi swap files
 *.swp
+# SPM files
+/.build
+/Packages
+
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,7 @@
+// swift-tools-version:3.1
+
+import PackageDescription
+
+let package = Package(
+    name: "UInt128"
+)
diff --git a/Playground.playground/Contents.swift b/Playground.playground/Contents.swift
@@ -2,4 +2,4 @@
 
 import UInt128
 
-let integer: UInt128 = 0xf
+let integer: UInt128 = 0xf
diff --git a/Playground.playground/contents.xcplayground b/Playground.playground/contents.xcplayground
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='osx'>
+<playground version='5.0' target-platform='macos' timelineScrubberEnabled='true'>
     <timeline fileName='timeline.xctimeline'/>
 </playground>
diff --git a/Playground.playground/timeline.xctimeline b/Playground.playground/timeline.xctimeline
diff --git a/library/UInt128.swift → Sources/UInt128.swift b/library/UInt128.swift → Sources/UInt128.swift
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -0,0 +1,12 @@
+import XCTest
+@testable import UInt128Tests
+
+XCTMain([
+    testCase(UInt128Tests.allTests),
+    testCase(UInt128StringTests.allTests),
+    testCase(UInt128UnsignedIntegerTests.allTests),
+    testCase(UInt128StrideableTests.allTests),
+    testCase(UInt128BitwiseOperationsTests.allTests),
+    testCase(UInt128IntegerArithmeticTests.allTests),
+    testCase(UInt128ComparableTests.allTests)
+])
diff --git a/tests/UInt128Tests.swift → Tests/UInt128Tests/UInt128Tests.swift b/tests/UInt128Tests.swift → Tests/UInt128Tests/UInt128Tests.swift
@@ -25,6 +25,16 @@ let bizarreUInt128: UInt128 = "0xf1f3f5f7f9fbfdfffefcfaf0f8f6f4f2"
 /// This class' purpose in life is to test UInt128 like there's no tomorrow.
 class UInt128Tests: XCTestCase {
     let sanityValue = UInt128(upperBits: 1878316677920070929, lowerBits: 2022432965322149909)
+    static var allTests = {
+        return [
+            ("testMax", testMax),
+            ("testMin", testMin),
+            ("testSignificantBits", testSignificantBits),
+            ("testBigEndian", testBigEndian),
+            ("testLittleEndian", testLittleEndian),
+            ("testSize", testSize)
+        ]
+    }
     func testMax() {
         XCTAssertEqual(
             UInt128.max,
@@ -94,6 +104,15 @@ class UInt128Tests: XCTestCase {
 class UInt128StringTests: XCTestCase {
     let bizarreUInt128: UInt128 = "0xf1f3f5f7f9fbfdfffefcfaf0f8f6f4f2"
     let sanityValue = UInt128(upperBits: 1878316677920070929, lowerBits: 2022432965322149909)
+    static var allTests = {
+        return [
+            ("testFringeStringConversions", testFringeStringConversions),
+            ("testBinaryStringConversion", testBinaryStringConversion),
+            ("testOctalStringConversion", testOctalStringConversion),
+            ("testDecimalStringConversion", testDecimalStringConversion),
+            ("testHexadecimalStringConversion", testHexadecimalStringConversion)
+        ]
+    }
     func testFringeStringConversions() {
         // Test Empty String Input.
         do {
@@ -318,6 +337,14 @@ class UInt128StringTests: XCTestCase {
     }*/
 }
 class UInt128UnsignedIntegerTests: XCTestCase {
+    static var allTests = {
+        return [
+            ("testUIntInputs", testUIntInputs),
+            ("testToUIntMax", testToUIntMax),
+            ("testHashValues", testHashValues),
+            ("testIndexTypes", testIndexTypes)
+        ]
+    }
     func testUIntInputs() {
         // Test UInt8 Input
         XCTAssertEqual(
@@ -391,6 +418,12 @@ class UInt128UnsignedIntegerTests: XCTestCase {
     }
 }
 class UInt128StrideableTests: XCTestCase {
+    static var allTests = {
+        return [
+            ("testAdvancedBy", testAdvancedBy),
+            ("testDistanceTo", testDistanceTo)
+        ]
+    }
     func testAdvancedBy() {
         XCTAssertEqual(
             UInt128.min.advancedBy(1), UInt128(integerLiteral: 1),
@@ -435,6 +468,17 @@ class UInt128StrideableTests: XCTestCase {
 class UInt128BitwiseOperationsTests: XCTestCase {
     let allZeros = UInt128.allZeros
     let allOnes = UInt128.max
+    static var allTests = {
+        return [
+            ("testAllZeros", testAllZeros),
+            ("testAND", testAND),
+            ("testOR", testOR),
+            ("testXOR", testXOR),
+            ("testComplement", testComplement),
+            ("testShiftLeft", testShiftLeft),
+            ("testShiftRight", testShiftRight)
+        ]
+    }
     func testAllZeros() {
         XCTAssertEqual(
             allZeros.value.upperBits, 0,
@@ -613,6 +657,14 @@ class UInt128BitwiseOperationsTests: XCTestCase {
     }
 }
 class UInt128IntegerArithmeticTests: XCTestCase {
+    static var allTests = {
+        return [
+            ("testAddition", testAddition),
+            ("testSubtraction", testSubtraction),
+            ("testDivisionAndModulus", testDivisionAndModulus),
+            ("testMultiplication", testMultiplication)
+        ]
+    }
     func testAddition() {
         var mathOperation = UInt128.addWithOverflow(UInt128(UInt64.max), 1)
         XCTAssert(
@@ -805,6 +857,12 @@ class UInt128IntegerArithmeticTests: XCTestCase {
     }
 }
 class UInt128ComparableTests: XCTestCase {
+    static var allTests = {
+        return [
+            ("testComparable", testComparable),
+            ("testEquatable", testEquatable)
+        ]
+    }
     func testComparable() {
         XCTAssertGreaterThan(
             UInt128(UInt64.max) << 64, UInt128(UInt64.max),

diff --git a/UInt128.xcodeproj/UInt128Tests_Info.plist b/UInt128.xcodeproj/UInt128Tests_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>
diff --git a/UInt128.xcodeproj/UInt128_Info.plist b/UInt128.xcodeproj/UInt128_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>