Skip to content

Commit

Permalink
Merge pull request #32 from trivago/swift-2.3
Browse files Browse the repository at this point in the history 
Update to Xcode 8.0 / Swift 2.3
  • Loading branch information
@bckr
bckr authored Sep 9, 2016
2 parents da55aaf + 3d99fab commit a30b38e
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "jspahrsummers/xcconfigs" ~> 0.9
github "Quick/Quick" ~> 0.9
github "Quick/Nimble" ~> 3.0
github "Quick/Nimble" ~> 4.1
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 68 files
+1 −0 .ruby-version
+16 −1 .travis.yml
+5 −3 CONTRIBUTING.md
+4 −0 Gemfile
+63 −0 Gemfile.lock
+3 −1 Nimble.podspec
+208 −160 Nimble.xcodeproj/project.pbxproj
+24 −4 README.md
+0 −0 Sources/Nimble/Adapters/NonObjectiveC/ExceptionCapture.swift
+0 −9 Sources/Nimble/Adapters/ObjectiveC/CurrentTestCaseTracker.h
+0 −0 Sources/Nimble/Adapters/ObjectiveC/DSL.h
+0 −0 Sources/Nimble/Adapters/ObjectiveC/DSL.m
+0 −0 Sources/Nimble/Adapters/ObjectiveC/NMBExceptionCapture.h
+1 −1 Sources/Nimble/Adapters/ObjectiveC/NMBExceptionCapture.m
+0 −0 Sources/Nimble/Adapters/ObjectiveC/NMBExpectation.swift
+0 −0 Sources/Nimble/Adapters/ObjectiveC/NMBObjCMatcher.swift
+18 −0 Sources/Nimble/Adapters/ObjectiveC/NMBStringify.h
+6 −0 Sources/Nimble/Adapters/ObjectiveC/NMBStringify.m
+78 −0 Sources/Nimble/Adapters/ObjectiveC/XCTestObservationCenter+Register.m
+6 −6 Sources/Nimble/DSL+Wait.swift
+7 −7 Sources/Nimble/DSL.swift
+2 −1 Sources/Nimble/Expectation.swift
+0 −0 Sources/Nimble/Matchers/AsyncMatcherWrapper.swift
+5 −9 Sources/Nimble/Matchers/BeCloseTo.swift
+1 −1 Sources/Nimble/Matchers/BeEmpty.swift
+6 −12 Sources/Nimble/Matchers/BeLogical.swift
+4 −4 Sources/Nimble/Matchers/Contain.swift
+2 −2 Sources/Nimble/Matchers/HaveCount.swift
+26 −0 Sources/Nimble/Matchers/MatchError.swift
+0 −26 Sources/Nimble/Matchers/MatcherFunc.swift
+5 −19 Sources/Nimble/Matchers/MatcherProtocols.swift
+0 −4 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+0 −128 Sources/Nimble/Matchers/ThrowError.swift
+2 −1 Sources/Nimble/Nimble.h
+2 −2 Sources/Nimble/Utils/Async.swift
+133 −0 Sources/Nimble/Utils/Errors.swift
+129 −38 Sources/Nimble/Utils/Stringers.swift
+3 −3 Tests/Nimble/AsynchronousTest.swift
+3 −3 Tests/Nimble/Helpers/utils.swift
+63 −17 Tests/Nimble/Matchers/BeCloseToTest.swift
+17 −0 Tests/Nimble/Matchers/BeEmptyTest.swift
+1 −7 Tests/Nimble/Matchers/BeGreaterThanTest.swift
+1 −7 Tests/Nimble/Matchers/BeLessThanTest.swift
+22 −4 Tests/Nimble/Matchers/ContainTest.swift
+4 −4 Tests/Nimble/Matchers/HaveCountTest.swift
+78 −0 Tests/Nimble/Matchers/MatchErrorTest.swift
+1 −1 Tests/Nimble/Matchers/PostNotificationTest.swift
+1 −1 Tests/Nimble/Matchers/SatisfyAnyOfTest.swift
+6 −6 Tests/Nimble/objc/ObjCAllPassTest.m
+4 −4 Tests/Nimble/objc/ObjCBeCloseToTest.m
+10 −2 Tests/Nimble/objc/ObjCBeEmptyTest.m
+2 −2 Tests/Nimble/objc/ObjCBeFalsyTest.m
+4 −4 Tests/Nimble/objc/ObjCBeGreaterThanOrEqualToTest.m
+4 −4 Tests/Nimble/objc/ObjCBeGreaterThanTest.m
+4 −4 Tests/Nimble/objc/ObjCBeLessThanOrEqualToTest.m
+4 −4 Tests/Nimble/objc/ObjCBeLessThanTest.m
+1 −1 Tests/Nimble/objc/ObjCBeNilTest.m
+1 −1 Tests/Nimble/objc/ObjCBeTrueTest.m
+2 −2 Tests/Nimble/objc/ObjCBeTruthyTest.m
+6 −6 Tests/Nimble/objc/ObjCContainTest.m
+2 −2 Tests/Nimble/objc/ObjCEqualTest.m
+17 −2 Tests/Nimble/objc/ObjCHaveCount.m
+3 −3 Tests/Nimble/objc/ObjCSatisfyAnyOfTest.m
+6 −6 Tests/Nimble/objc/ObjCUserDescriptionTest.m
+31 −0 Tests/Nimble/objc/ObjcStringersTest.m
+1 −1 circle.yml
+4 −18 script/release
+28 −3 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 74 files
+1 −0 .ruby-version
+1 −1 .swift-version
+37 −6 .travis.yml
+2 −3 CONTRIBUTING.md
+1 −1 Documentation/en-us/ArrangeActAssert.md
+1 −1 Documentation/en-us/BehavioralTesting.md
+0 −0 Documentation/en-us/ConfiguringQuick.md
+0 −0 Documentation/en-us/InstallingFileTemplates.md
+10 −2 Documentation/en-us/InstallingQuick.md
+0 −0 Documentation/en-us/MoreResources.md
+0 −0 Documentation/en-us/NimbleAssertions.md
+0 −0 Documentation/en-us/QuickExamplesAndGroups.md
+4 −0 Documentation/en-us/QuickInObjectiveC.md
+2 −2 Documentation/en-us/README.md
+0 −0 Documentation/en-us/SettingUpYourXcodeProject.md
+2 −2 Documentation/en-us/SharedExamples.md
+0 −0 Documentation/en-us/TestingApps.md
+212 −0 Documentation/ja/ArrangeActAssert.md
+81 −0 Documentation/ja/BehavioralTesting.md
+101 −0 Documentation/ja/ConfiguringQuick.md
+26 −0 Documentation/ja/InstallingFileTemplates.md
+152 −0 Documentation/ja/InstallingQuick.md
+27 −0 Documentation/ja/MoreResources.md
+100 −0 Documentation/ja/NimbleAssertions.md
+477 −0 Documentation/ja/QuickExamplesAndGroups.md
+49 −0 Documentation/ja/QuickInObjectiveC.md
+46 −0 Documentation/ja/README.md
+77 −0 Documentation/ja/SettingUpYourXcodeProject.md
+126 −0 Documentation/ja/SharedExamples.md
+175 −0 Documentation/ja/TestingApps.md
+75 −0 Documentation/zh-cn/SettingUpYourXcodeProject.md
+1 −1 Externals/Nimble
+3 −0 Gemfile
+67 −0 Gemfile.lock
+2 −1 Quick.podspec
+55 −7 Quick.xcodeproj/project.pbxproj
+5 −5 Quick.xcodeproj/xcshareddata/xcschemes/Quick-OSX.xcscheme
+5 −5 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+0 −18 QuickTests/FunctionalTests/ContextTests.swift
+4 −4 README.md
+19 −24 Rakefile
+5 −5 Sources/Quick/DSL/DSL.swift
+6 −8 Sources/Quick/DSL/World+DSL.swift
+1 −1 Sources/Quick/Example.swift
+7 −0 Sources/Quick/QuickMain.swift
+7 −5 Sources/Quick/QuickSpec.h
+18 −18 Sources/Quick/QuickSpec.m
+1 −1 Sources/Quick/QuickSpec.swift
+1 −0 Sources/Quick/World.h
+11 −2 Sources/Quick/World.swift
+1 −1 Sources/QuickFocusedTests/FocusedTests.swift
+7 −2 Sources/QuickTestHelpers/SpecRunner.swift
+1 −1 Sources/QuickTests/FunctionalTests/AfterEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/AfterSuiteTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/BeforeSuiteTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/Configuration/AfterEach/Configuration+AfterEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/Configuration/BeforeEach/Configuration+BeforeEachTests.swift
+19 −0 Sources/QuickTests/FunctionalTests/CrossReferencingSpecs.swift
+1 −1 Sources/QuickTests/FunctionalTests/DescribeTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/PendingTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/SharedExamples+BeforeEachTests.swift
+1 −1 Sources/QuickTests/FunctionalTests/SharedExamplesTests.swift
+5 −1 Sources/QuickTests/Helpers/QCKSpecRunner.m
+1 −1 Sources/QuickTests/Helpers/XCTestCaseProvider.swift
+7 −11 Sources/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.h
+54 −0 Sources/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.m
+2 −0 Sources/QuickTests/main.swift
+2 −14 circle.yml
+3 −20 script/release
+0 −5 script/travis-install-osx
+7 −9 script/travis-script-osx
40 changes: 26 additions & 14 deletions Dobby.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
containerPortal = DC7F6AEF1AD8291800CCBF6D /* Project object */;
proxyType = 1;
remoteGlobalIDString = DC8452171ADBF5CC006AC5D4;
remoteInfo = "Dobby-Mac";
remoteInfo = "Dobby-macOS";
};
/* End PBXContainerItemProxy section */

Expand Down Expand Up @@ -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 */,
Expand All @@ -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 */,
Expand All @@ -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";
};
Expand All @@ -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;
};
};
};
Expand All @@ -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 */,
);
Expand Down Expand Up @@ -538,7 +542,7 @@
};
DC8452251ADBF5CC006AC5D4 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DC8452171ADBF5CC006AC5D4 /* Dobby-Mac */;
target = DC8452171ADBF5CC006AC5D4 /* Dobby-macOS */;
targetProxy = DC8452241ADBF5CC006AC5D4 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand Down Expand Up @@ -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 */,
Expand All @@ -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 */,
Expand Down
7 changes: 7 additions & 0 deletions Dobby.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ...xcshareddata/xcschemes/Dobby-Mac.xcscheme → ...shareddata/xcschemes/Dobby-macOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4"
BuildableName = "Dobby.framework"
BlueprintName = "Dobby-Mac"
BlueprintName = "Dobby-macOS"
ReferencedContainer = "container:Dobby.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -58,7 +58,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC8452211ADBF5CC006AC5D4"
BuildableName = "DobbyTests.xctest"
BlueprintName = "Dobby-MacTests"
BlueprintName = "Dobby-macOSTests"
ReferencedContainer = "container:Dobby.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -77,7 +77,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC8452211ADBF5CC006AC5D4"
BuildableName = "DobbyTests.xctest"
BlueprintName = "Dobby-MacTests"
BlueprintName = "Dobby-macOSTests"
ReferencedContainer = "container:Dobby.xcodeproj">
</BuildableReference>
</TestableReference>
Expand All @@ -87,7 +87,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4"
BuildableName = "Dobby.framework"
BlueprintName = "Dobby-Mac"
BlueprintName = "Dobby-macOS"
ReferencedContainer = "container:Dobby.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -109,7 +109,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4"
BuildableName = "Dobby.framework"
BlueprintName = "Dobby-Mac"
BlueprintName = "Dobby-macOS"
ReferencedContainer = "container:Dobby.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -127,7 +127,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC8452171ADBF5CC006AC5D4"
BuildableName = "Dobby.framework"
BlueprintName = "Dobby-Mac"
BlueprintName = "Dobby-macOS"
ReferencedContainer = "container:Dobby.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
10 changes: 5 additions & 5 deletions circle.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine:
xcode:
version: 7.3
version: 8.0

dependencies:
override:
Expand All @@ -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 |
Expand Down

0 comments on commit a30b38e

Please sign in to comment.