diff --git a/Cartfile.private b/Cartfile.private index 09ffb80..c4e56e3 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "jspahrsummers/xcconfigs" ~> 0.9 github "Quick/Quick" ~> 0.9 -github "Quick/Nimble" ~> 3.0 +github "Quick/Nimble" ~> 4.1 diff --git a/Cartfile.resolved b/Cartfile.resolved index a8c20ab..71c03dc 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "Quick/Nimble" "v3.2.0" -github "Quick/Quick" "v0.9.1" +github "Quick/Nimble" "v4.1.0" +github "Quick/Quick" "v0.9.3" github "jspahrsummers/xcconfigs" "0.9" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 3f3ae0e..b4a0f9d 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 3f3ae0ebd210ed563ce75e313f1b6022188eb660 +Subproject commit b4a0f9d6ee6b89f0e2f9ee8fa32aaa7200b1e27c diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index 2f03756..faa6056 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit 2f037560be197f0f5ae992512549bc29fabb3818 +Subproject commit faa6056c0c7da69fc1fb494cf61fa264aea4d9bc diff --git a/Dobby.xcodeproj/project.pbxproj b/Dobby.xcodeproj/project.pbxproj index 087d994..d6e2fd7 100644 --- a/Dobby.xcodeproj/project.pbxproj +++ b/Dobby.xcodeproj/project.pbxproj @@ -49,7 +49,7 @@ containerPortal = DC7F6AEF1AD8291800CCBF6D /* Project object */; proxyType = 1; remoteGlobalIDString = DC8452171ADBF5CC006AC5D4; - remoteInfo = "Dobby-Mac"; + remoteInfo = "Dobby-macOS"; }; /* End PBXContainerItemProxy section */ @@ -372,9 +372,9 @@ productReference = DC7F6B031AD8291800CCBF6D /* DobbyTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - DC8452171ADBF5CC006AC5D4 /* Dobby-Mac */ = { + DC8452171ADBF5CC006AC5D4 /* Dobby-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = DC84522B1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-Mac" */; + buildConfigurationList = DC84522B1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-macOS" */; buildPhases = ( DC8452131ADBF5CC006AC5D4 /* Sources */, DC8452141ADBF5CC006AC5D4 /* Frameworks */, @@ -385,14 +385,14 @@ ); dependencies = ( ); - name = "Dobby-Mac"; - productName = "Dobby-Mac"; + name = "Dobby-macOS"; + productName = "Dobby-macOS"; productReference = DC8452181ADBF5CC006AC5D4 /* Dobby.framework */; productType = "com.apple.product-type.framework"; }; - DC8452211ADBF5CC006AC5D4 /* Dobby-MacTests */ = { + DC8452211ADBF5CC006AC5D4 /* Dobby-macOSTests */ = { isa = PBXNativeTarget; - buildConfigurationList = DC84522E1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-MacTests" */; + buildConfigurationList = DC84522E1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-macOSTests" */; buildPhases = ( DC84521E1ADBF5CC006AC5D4 /* Sources */, DC84521F1ADBF5CC006AC5D4 /* Frameworks */, @@ -403,8 +403,8 @@ dependencies = ( DC8452251ADBF5CC006AC5D4 /* PBXTargetDependency */, ); - name = "Dobby-MacTests"; - productName = "Dobby-MacTests"; + name = "Dobby-macOSTests"; + productName = "Dobby-macOSTests"; productReference = DC8452221ADBF5CC006AC5D4 /* DobbyTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; @@ -420,15 +420,19 @@ TargetAttributes = { DC7F6AF71AD8291800CCBF6D = { CreatedOnToolsVersion = 6.3; + LastSwiftMigration = 0800; }; DC7F6B021AD8291800CCBF6D = { CreatedOnToolsVersion = 6.3; + LastSwiftMigration = 0800; }; DC8452171ADBF5CC006AC5D4 = { CreatedOnToolsVersion = 6.3; + LastSwiftMigration = 0800; }; DC8452211ADBF5CC006AC5D4 = { CreatedOnToolsVersion = 6.3; + LastSwiftMigration = 0800; }; }; }; @@ -444,8 +448,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - DC8452171ADBF5CC006AC5D4 /* Dobby-Mac */, - DC8452211ADBF5CC006AC5D4 /* Dobby-MacTests */, + DC8452171ADBF5CC006AC5D4 /* Dobby-macOS */, + DC8452211ADBF5CC006AC5D4 /* Dobby-macOSTests */, DC7F6AF71AD8291800CCBF6D /* Dobby-iOS */, DC7F6B021AD8291800CCBF6D /* Dobby-iOSTests */, ); @@ -538,7 +542,7 @@ }; DC8452251ADBF5CC006AC5D4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DC8452171ADBF5CC006AC5D4 /* Dobby-Mac */; + target = DC8452171ADBF5CC006AC5D4 /* Dobby-macOS */; targetProxy = DC8452241ADBF5CC006AC5D4 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -589,6 +593,7 @@ ); INFOPLIST_FILE = Dobby/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + SWIFT_VERSION = 2.3; }; name = Debug; }; @@ -606,6 +611,7 @@ ); INFOPLIST_FILE = Dobby/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -620,6 +626,7 @@ INFOPLIST_FILE = DobbyTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 2.3; }; name = Debug; }; @@ -634,6 +641,7 @@ INFOPLIST_FILE = DobbyTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -650,6 +658,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = Dobby/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + SWIFT_VERSION = 2.3; }; name = Debug; }; @@ -666,6 +675,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = Dobby/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -680,6 +690,7 @@ INFOPLIST_FILE = DobbyTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 2.3; }; name = Debug; }; @@ -694,6 +705,7 @@ INFOPLIST_FILE = DobbyTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -727,7 +739,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DC84522B1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-Mac" */ = { + DC84522B1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( DC84522C1ADBF5CC006AC5D4 /* Debug */, @@ -736,7 +748,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DC84522E1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-MacTests" */ = { + DC84522E1ADBF5CC006AC5D4 /* Build configuration list for PBXNativeTarget "Dobby-macOSTests" */ = { isa = XCConfigurationList; buildConfigurations = ( DC84522F1ADBF5CC006AC5D4 /* Debug */, diff --git a/Dobby.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Dobby.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/Dobby.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-Mac.xcscheme b/Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-macOS.xcscheme similarity index 95% rename from Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-Mac.xcscheme rename to Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-macOS.xcscheme index 40f927c..340748d 100644 --- a/Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-Mac.xcscheme +++ b/Dobby.xcodeproj/xcshareddata/xcschemes/Dobby-macOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4" BuildableName = "Dobby.framework" - BlueprintName = "Dobby-Mac" + BlueprintName = "Dobby-macOS" ReferencedContainer = "container:Dobby.xcodeproj"> @@ -58,7 +58,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "DC8452211ADBF5CC006AC5D4" BuildableName = "DobbyTests.xctest" - BlueprintName = "Dobby-MacTests" + BlueprintName = "Dobby-macOSTests" ReferencedContainer = "container:Dobby.xcodeproj"> @@ -77,7 +77,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "DC8452211ADBF5CC006AC5D4" BuildableName = "DobbyTests.xctest" - BlueprintName = "Dobby-MacTests" + BlueprintName = "Dobby-macOSTests" ReferencedContainer = "container:Dobby.xcodeproj"> @@ -87,7 +87,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4" BuildableName = "Dobby.framework" - BlueprintName = "Dobby-Mac" + BlueprintName = "Dobby-macOS" ReferencedContainer = "container:Dobby.xcodeproj"> @@ -109,7 +109,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4" BuildableName = "Dobby.framework" - BlueprintName = "Dobby-Mac" + BlueprintName = "Dobby-macOS" ReferencedContainer = "container:Dobby.xcodeproj"> @@ -127,7 +127,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4" BuildableName = "Dobby.framework" - BlueprintName = "Dobby-Mac" + BlueprintName = "Dobby-macOS" ReferencedContainer = "container:Dobby.xcodeproj"> diff --git a/circle.yml b/circle.yml index ed1f782..60a7799 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: xcode: - version: 7.3 + version: 8.0 dependencies: override: @@ -12,17 +12,17 @@ test: xcodebuild -sdk macosx -workspace Dobby.xcworkspace - -scheme Dobby-Mac + -scheme Dobby-macOS clean build test | - tee $CIRCLE_ARTIFACTS/xcode_raw_mac.log | - xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-mac.xml + tee $CIRCLE_ARTIFACTS/xcode_raw_macos.log | + xcpretty --color --report junit --output $CIRCLE_TEST_REPORTS/xcode/results-macos.xml - set -o pipefail && xcodebuild CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= PROVISIONING_PROFILE= -sdk iphonesimulator - -destination 'platform=iOS Simulator,OS=9.3,name=iPhone 6s' + -destination 'platform=iOS Simulator,OS=10.0,name=iPhone 6s' -workspace Dobby.xcworkspace -scheme Dobby-iOS clean build test |