diff --git a/.gitignore b/.gitignore index 0a5698e..df36ef4 100644 --- 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 new file mode 100644 index 0000000..adf4525 --- /dev/null +++ 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 index c954258..9905423 100644 --- a/Playground.playground/Contents.swift +++ b/Playground.playground/Contents.swift @@ -2,4 +2,4 @@ import UInt128 -let integer: UInt128 = 0xf \ No newline at end of file +let integer: UInt128 = 0xf diff --git a/Playground.playground/contents.xcplayground b/Playground.playground/contents.xcplayground index 06828af..76285aa 100644 --- a/Playground.playground/contents.xcplayground +++ b/Playground.playground/contents.xcplayground @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Playground.playground/timeline.xctimeline b/Playground.playground/timeline.xctimeline deleted file mode 100644 index bf468af..0000000 --- a/Playground.playground/timeline.xctimeline +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/library/UInt128.swift b/Sources/UInt128.swift similarity index 100% rename from library/UInt128.swift rename to Sources/UInt128.swift diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift new file mode 100644 index 0000000..1c70c75 --- /dev/null +++ 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 b/Tests/UInt128Tests/UInt128Tests.swift similarity index 94% rename from tests/UInt128Tests.swift rename to Tests/UInt128Tests/UInt128Tests.swift index 80ed609..27d4e26 100644 --- a/tests/UInt128Tests.swift +++ b/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 new file mode 100644 index 0000000..7c23420 --- /dev/null +++ b/UInt128.xcodeproj/UInt128Tests_Info.plist @@ -0,0 +1,25 @@ + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/UInt128.xcodeproj/UInt128_Info.plist b/UInt128.xcodeproj/UInt128_Info.plist new file mode 100644 index 0000000..57ada9f --- /dev/null +++ b/UInt128.xcodeproj/UInt128_Info.plist @@ -0,0 +1,25 @@ + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + diff --git a/UInt128.xcodeproj/project.pbxproj b/UInt128.xcodeproj/project.pbxproj index 09709c1..6ee1f25 100644 --- a/UInt128.xcodeproj/project.pbxproj +++ b/UInt128.xcodeproj/project.pbxproj @@ -3,152 +3,109 @@ archiveVersion = 1; classes = { }; - objectVersion = 48; + objectVersion = 46; objects = { -/* Begin PBXAggregateTarget section */ - 48D0A6B61C80F49500A73CDF /* Aggregate */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 48D0A6B71C80F49500A73CDF /* Build configuration list for PBXAggregateTarget "Aggregate" */; - buildPhases = ( - 48D0A6BA1C80F4B500A73CDF /* ShellScript */, - ); - dependencies = ( - ); - name = Aggregate; - productName = Aggregate; - }; -/* End PBXAggregateTarget section */ - /* Begin PBXBuildFile section */ - 48D0A69D1C80F17300A73CDF /* UInt128.h in Headers */ = {isa = PBXBuildFile; fileRef = 48D0A69C1C80F17300A73CDF /* UInt128.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 48D0A6A41C80F17300A73CDF /* UInt128.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48D0A6991C80F17300A73CDF /* UInt128.framework */; }; - 48D0A6A91C80F17300A73CDF /* UInt128Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48D0A6A81C80F17300A73CDF /* UInt128Tests.swift */; }; - 48D0A6B41C80F22000A73CDF /* UInt128.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48D0A6B31C80F22000A73CDF /* UInt128.swift */; }; + OBJ_21 /* UInt128.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_8 /* UInt128.swift */; }; + OBJ_28 /* UInt128Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* UInt128Tests.swift */; }; + OBJ_30 /* UInt128.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* UInt128.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 48D0A6A51C80F17300A73CDF /* PBXContainerItemProxy */ = { + 48389B5F1EDB9E90008C1177 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 48D0A6901C80F17300A73CDF /* Project object */; + containerPortal = OBJ_1 /* Project object */; proxyType = 1; - remoteGlobalIDString = 48D0A6981C80F17300A73CDF; + remoteGlobalIDString = OBJ_16; remoteInfo = UInt128; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 48D0A6991C80F17300A73CDF /* UInt128.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = UInt128.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 48D0A69C1C80F17300A73CDF /* UInt128.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UInt128.h; sourceTree = ""; }; - 48D0A69E1C80F17300A73CDF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 48D0A6A31C80F17300A73CDF /* UInt128Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UInt128Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 48D0A6A81C80F17300A73CDF /* UInt128Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UInt128Tests.swift; sourceTree = ""; }; - 48D0A6AA1C80F17300A73CDF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 48D0A6B31C80F22000A73CDF /* UInt128.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UInt128.swift; sourceTree = ""; }; - 48D0A6B51C80F44700A73CDF /* build_aggregate.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = build_aggregate.sh; sourceTree = ""; }; - 48D0A6BB1C80F56500A73CDF /* Playground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground.playground; sourceTree = ""; }; - 48D0A6BD1C80F86400A73CDF /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; - 48D0A6BE1C80F86400A73CDF /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + 48389B601EDB9F78008C1177 /* Playground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Playground.playground; sourceTree = ""; }; + OBJ_11 /* UInt128Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UInt128Tests.swift; sourceTree = ""; }; + OBJ_12 /* bin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bin; sourceTree = SOURCE_ROOT; }; + OBJ_14 /* UInt128.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UInt128.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + OBJ_15 /* UInt128Tests.xctest */ = {isa = PBXFileReference; lastKnownFileType = file; path = UInt128Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; + OBJ_8 /* UInt128.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UInt128.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 48D0A6951C80F17300A73CDF /* Frameworks */ = { + OBJ_22 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 0; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 48D0A6A01C80F17300A73CDF /* Frameworks */ = { + OBJ_29 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 0; files = ( - 48D0A6A41C80F17300A73CDF /* UInt128.framework in Frameworks */, + OBJ_30 /* UInt128.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 48D0A68F1C80F17300A73CDF = { + OBJ_10 /* UInt128Tests */ = { isa = PBXGroup; children = ( - 48D0A6BB1C80F56500A73CDF /* Playground.playground */, - 48D0A6BC1C80F5EE00A73CDF /* bin */, - 48D0A6C11C80F86B00A73CDF /* docs */, - 48D0A69B1C80F17300A73CDF /* library */, - 48D0A6A71C80F17300A73CDF /* tests */, - 48D0A69A1C80F17300A73CDF /* Products */, + OBJ_11 /* UInt128Tests.swift */, ); - sourceTree = ""; + name = UInt128Tests; + path = Tests/UInt128Tests; + sourceTree = SOURCE_ROOT; }; - 48D0A69A1C80F17300A73CDF /* Products */ = { + OBJ_13 /* Products */ = { isa = PBXGroup; children = ( - 48D0A6991C80F17300A73CDF /* UInt128.framework */, - 48D0A6A31C80F17300A73CDF /* UInt128Tests.xctest */, + OBJ_14 /* UInt128.framework */, + OBJ_15 /* UInt128Tests.xctest */, ); name = Products; - sourceTree = ""; + sourceTree = BUILT_PRODUCTS_DIR; }; - 48D0A69B1C80F17300A73CDF /* library */ = { + OBJ_5 = { isa = PBXGroup; children = ( - 48D0A6B31C80F22000A73CDF /* UInt128.swift */, - 48D0A69C1C80F17300A73CDF /* UInt128.h */, - 48D0A69E1C80F17300A73CDF /* Info.plist */, + 48389B601EDB9F78008C1177 /* Playground.playground */, + OBJ_6 /* Package.swift */, + OBJ_12 /* bin */, + OBJ_7 /* Sources */, + OBJ_9 /* Tests */, + OBJ_13 /* Products */, ); - path = library; sourceTree = ""; }; - 48D0A6A71C80F17300A73CDF /* tests */ = { + OBJ_7 /* Sources */ = { isa = PBXGroup; children = ( - 48D0A6A81C80F17300A73CDF /* UInt128Tests.swift */, - 48D0A6AA1C80F17300A73CDF /* Info.plist */, + OBJ_8 /* UInt128.swift */, ); - path = tests; - sourceTree = ""; + path = Sources; + sourceTree = SOURCE_ROOT; }; - 48D0A6BC1C80F5EE00A73CDF /* bin */ = { + OBJ_9 /* Tests */ = { isa = PBXGroup; children = ( - 48D0A6B51C80F44700A73CDF /* build_aggregate.sh */, + OBJ_10 /* UInt128Tests */, ); - path = bin; - sourceTree = ""; - }; - 48D0A6C11C80F86B00A73CDF /* docs */ = { - isa = PBXGroup; - children = ( - 48D0A6BD1C80F86400A73CDF /* LICENSE */, - 48D0A6BE1C80F86400A73CDF /* README.md */, - ); - name = docs; - sourceTree = ""; + name = Tests; + sourceTree = SOURCE_ROOT; }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - 48D0A6961C80F17300A73CDF /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 48D0A69D1C80F17300A73CDF /* UInt128.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ - 48D0A6981C80F17300A73CDF /* UInt128 */ = { + OBJ_16 /* UInt128 */ = { isa = PBXNativeTarget; - buildConfigurationList = 48D0A6AD1C80F17300A73CDF /* Build configuration list for PBXNativeTarget "UInt128" */; + buildConfigurationList = OBJ_17 /* Build configuration list for PBXNativeTarget "UInt128" */; buildPhases = ( - 48D0A6941C80F17300A73CDF /* Sources */, - 48D0A6951C80F17300A73CDF /* Frameworks */, - 48D0A6961C80F17300A73CDF /* Headers */, - 48D0A6971C80F17300A73CDF /* Resources */, + OBJ_20 /* Sources */, + OBJ_22 /* Frameworks */, ); buildRules = ( ); @@ -156,347 +113,231 @@ ); name = UInt128; productName = UInt128; - productReference = 48D0A6991C80F17300A73CDF /* UInt128.framework */; + productReference = OBJ_14 /* UInt128.framework */; productType = "com.apple.product-type.framework"; }; - 48D0A6A21C80F17300A73CDF /* UInt128Tests */ = { + OBJ_23 /* UInt128Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 48D0A6B01C80F17300A73CDF /* Build configuration list for PBXNativeTarget "UInt128Tests" */; + buildConfigurationList = OBJ_24 /* Build configuration list for PBXNativeTarget "UInt128Tests" */; buildPhases = ( - 48D0A69F1C80F17300A73CDF /* Sources */, - 48D0A6A01C80F17300A73CDF /* Frameworks */, - 48D0A6A11C80F17300A73CDF /* Resources */, + OBJ_27 /* Sources */, + OBJ_29 /* Frameworks */, ); buildRules = ( ); dependencies = ( - 48D0A6A61C80F17300A73CDF /* PBXTargetDependency */, + OBJ_31 /* PBXTargetDependency */, ); name = UInt128Tests; productName = UInt128Tests; - productReference = 48D0A6A31C80F17300A73CDF /* UInt128Tests.xctest */; + productReference = OBJ_15 /* UInt128Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 48D0A6901C80F17300A73CDF /* Project object */ = { + OBJ_1 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0800; - ORGANIZATIONNAME = Jitsusama; - TargetAttributes = { - 48D0A6981C80F17300A73CDF = { - CreatedOnToolsVersion = 7.2.1; - DevelopmentTeam = 98ZY9S3LY6; - LastSwiftMigration = 0800; - }; - 48D0A6A21C80F17300A73CDF = { - CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0800; - }; - 48D0A6B61C80F49500A73CDF = { - CreatedOnToolsVersion = 7.2.1; - }; - }; + LastUpgradeCheck = 9999; }; - buildConfigurationList = 48D0A6931C80F17300A73CDF /* Build configuration list for PBXProject "UInt128" */; - compatibilityVersion = "Xcode 8.0"; + buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "UInt128" */; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( en, ); - mainGroup = 48D0A68F1C80F17300A73CDF; - productRefGroup = 48D0A69A1C80F17300A73CDF /* Products */; + mainGroup = OBJ_5; + productRefGroup = OBJ_13 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 48D0A6981C80F17300A73CDF /* UInt128 */, - 48D0A6A21C80F17300A73CDF /* UInt128Tests */, - 48D0A6B61C80F49500A73CDF /* Aggregate */, + OBJ_16 /* UInt128 */, + OBJ_23 /* UInt128Tests */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - 48D0A6971C80F17300A73CDF /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 48D0A6A11C80F17300A73CDF /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 48D0A6BA1C80F4B500A73CDF /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = /Users/jitsusama/Dropbox/Programming/UInt128/bin/build_aggregate.sh; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ - 48D0A6941C80F17300A73CDF /* Sources */ = { + OBJ_20 /* Sources */ = { isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 0; files = ( - 48D0A6B41C80F22000A73CDF /* UInt128.swift in Sources */, + OBJ_21 /* UInt128.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 48D0A69F1C80F17300A73CDF /* Sources */ = { + OBJ_27 /* Sources */ = { isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; + buildActionMask = 0; files = ( - 48D0A6A91C80F17300A73CDF /* UInt128Tests.swift in Sources */, + OBJ_28 /* UInt128Tests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 48D0A6A61C80F17300A73CDF /* PBXTargetDependency */ = { + OBJ_31 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 48D0A6981C80F17300A73CDF /* UInt128 */; - targetProxy = 48D0A6A51C80F17300A73CDF /* PBXContainerItemProxy */; + target = OBJ_16 /* UInt128 */; + targetProxy = 48389B5F1EDB9E90008C1177 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 48D0A6AB1C80F17300A73CDF /* Debug */ = { + OBJ_18 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.2.0; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", + FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - VALID_ARCHS = "i386 x86_64 armv7s armv7 arm64"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; + HEADER_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = UInt128.xcodeproj/UInt128_Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; + OTHER_LDFLAGS = "$(inherited)"; + OTHER_SWIFT_FLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = UInt128; + PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + TARGET_NAME = UInt128; }; name = Debug; }; - 48D0A6AC1C80F17300A73CDF /* Release */ = { + OBJ_19 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.2.0; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos"; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - VALID_ARCHS = "i386 x86_64 armv7s armv7 arm64"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; + ENABLE_TESTABILITY = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + HEADER_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = UInt128.xcodeproj/UInt128_Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(TOOLCHAIN_DIR)/usr/lib/swift/macosx"; + OTHER_LDFLAGS = "$(inherited)"; + OTHER_SWIFT_FLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = UInt128; + PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + TARGET_NAME = UInt128; }; name = Release; }; - 48D0A6AE1C80F17300A73CDF /* Debug */ = { + OBJ_25 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 0.2.0; - DYLIB_CURRENT_VERSION = 0.2.0; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "$(SRCROOT)/library/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = ca.Jitsusama.UInt128; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + HEADER_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = UInt128.xcodeproj/UInt128Tests_Info.plist; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks"; + OTHER_LDFLAGS = "$(inherited)"; + OTHER_SWIFT_FLAGS = "$(inherited)"; + TARGET_NAME = UInt128Tests; }; name = Debug; }; - 48D0A6AF1C80F17300A73CDF /* Release */ = { + OBJ_26 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - COMBINE_HIDPI_IMAGES = YES; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 0.2.0; - DYLIB_CURRENT_VERSION = 0.2.0; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "$(SRCROOT)/library/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = ca.Jitsusama.UInt128; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + EMBEDDED_CONTENT_CONTAINS_SWIFT = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PLATFORM_DIR)/Developer/Library/Frameworks", + ); + HEADER_SEARCH_PATHS = "$(inherited)"; + INFOPLIST_FILE = UInt128.xcodeproj/UInt128Tests_Info.plist; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks @loader_path/Frameworks"; + OTHER_LDFLAGS = "$(inherited)"; + OTHER_SWIFT_FLAGS = "$(inherited)"; + TARGET_NAME = UInt128Tests; }; name = Release; }; - 48D0A6B11C80F17300A73CDF /* Debug */ = { + OBJ_3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = tests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = ca.Jitsusama.UInt128Tests; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + MACOSX_DEPLOYMENT_TARGET = 10.10; + ONLY_ACTIVE_ARCH = YES; + OTHER_SWIFT_FLAGS = "-DXcode"; PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; + USE_HEADERMAP = NO; }; name = Debug; }; - 48D0A6B21C80F17300A73CDF /* Release */ = { + OBJ_4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; - INFOPLIST_FILE = tests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = ca.Jitsusama.UInt128Tests; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_OPTIMIZATION_LEVEL = s; + MACOSX_DEPLOYMENT_TARGET = 10.10; + OTHER_SWIFT_FLAGS = "-DXcode"; PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = SWIFT_PACKAGE; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; - }; - name = Release; - }; - 48D0A6B81C80F49500A73CDF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 48D0A6B91C80F49500A73CDF /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; + USE_HEADERMAP = NO; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 48D0A6931C80F17300A73CDF /* Build configuration list for PBXProject "UInt128" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 48D0A6AB1C80F17300A73CDF /* Debug */, - 48D0A6AC1C80F17300A73CDF /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 48D0A6AD1C80F17300A73CDF /* Build configuration list for PBXNativeTarget "UInt128" */ = { + OBJ_17 /* Build configuration list for PBXNativeTarget "UInt128" */ = { isa = XCConfigurationList; buildConfigurations = ( - 48D0A6AE1C80F17300A73CDF /* Debug */, - 48D0A6AF1C80F17300A73CDF /* Release */, + OBJ_18 /* Debug */, + OBJ_19 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; - 48D0A6B01C80F17300A73CDF /* Build configuration list for PBXNativeTarget "UInt128Tests" */ = { + OBJ_2 /* Build configuration list for PBXProject "UInt128" */ = { isa = XCConfigurationList; buildConfigurations = ( - 48D0A6B11C80F17300A73CDF /* Debug */, - 48D0A6B21C80F17300A73CDF /* Release */, + OBJ_3 /* Debug */, + OBJ_4 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; - 48D0A6B71C80F49500A73CDF /* Build configuration list for PBXAggregateTarget "Aggregate" */ = { + OBJ_24 /* Build configuration list for PBXNativeTarget "UInt128Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 48D0A6B81C80F49500A73CDF /* Debug */, - 48D0A6B91C80F49500A73CDF /* Release */, + OBJ_25 /* Debug */, + OBJ_26 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; - rootObject = 48D0A6901C80F17300A73CDF /* Project object */; + rootObject = OBJ_1 /* Project object */; } diff --git a/UInt128.xcodeproj/xcshareddata/xcschemes/UInt128.xcscheme b/UInt128.xcodeproj/xcshareddata/xcschemes/UInt128.xcscheme index 1a0102e..821ce6c 100644 --- a/UInt128.xcodeproj/xcshareddata/xcschemes/UInt128.xcscheme +++ b/UInt128.xcodeproj/xcshareddata/xcschemes/UInt128.xcscheme @@ -1,6 +1,6 @@ @@ -32,22 +32,13 @@ skipped = "NO"> - - - - @@ -64,7 +55,7 @@ @@ -79,15 +70,6 @@ savedToolIdentifier = "" useCustomWorkingDirectory = "NO" debugDocumentVersioning = "YES"> - - - - diff --git a/UInt128.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist b/UInt128.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..6f1b8ec --- /dev/null +++ b/UInt128.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist @@ -0,0 +1,12 @@ + + + + SchemeUserState + + UInt128.xcscheme + + + SuppressBuildableAutocreation + + + diff --git a/library/Info.plist b/library/Info.plist deleted file mode 100644 index c77d903..0000000 --- a/library/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 0.4.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSHumanReadableCopyright - Copyright © 2016 Joel Gerber. Apache 2.0 License. - NSPrincipalClass - - - diff --git a/library/UInt128.h b/library/UInt128.h deleted file mode 100644 index b018f47..0000000 --- a/library/UInt128.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// UInt128.h -// -// Swift to Objective-C Bridging Header -// -// Copyright 2016 Joel Gerber -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#import - -//! Project version number for UInt128. -FOUNDATION_EXPORT double UInt128VersionNumber; - -//! Project version string for UInt128. -FOUNDATION_EXPORT const unsigned char UInt128VersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/tests/Info.plist b/tests/Info.plist deleted file mode 100644 index 1eed703..0000000 --- a/tests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 0.2.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - -