Skip to content

Commit

Permalink
Merge pull request #95 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
@SusannProszak
SusannProszak authored Sep 20, 2016
2 parents 8d26771 + 7b247df commit 7eef787
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 48 deletions.
4 changes: 2 additions & 2 deletions Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "jspahrsummers/xcconfigs" ~> 0.9
github "Quick/Quick" ~> 0.9
github "Quick/Nimble" ~> 4.0
github "AliSoftware/OHHTTPStubs" ~> 4.7
github "Quick/Nimble" ~> 4.1
github "AliSoftware/OHHTTPStubs" ~> 5.2.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "Quick/Nimble" "v4.1.0"
github "AliSoftware/OHHTTPStubs" "4.8.0"
github "Quick/Quick" "v0.9.2"
github "AliSoftware/OHHTTPStubs" "5.2.0"
github "Quick/Quick" "v0.9.3"
github "antitypical/Result" "2.1.3"
github "jspahrsummers/xcconfigs" "0.9"
github "ReactiveCocoa/ReactiveCocoa" "v4.2.2"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/OHHTTPStubs
Submodule OHHTTPStubs updated 147 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 35 files
+1 −0 .ruby-version
+37 −6 .travis.yml
+2 −3 CONTRIBUTING.md
+2 −2 Documentation/en-us/InstallingQuick.md
+4 −0 Documentation/en-us/QuickInObjectiveC.md
+2 −2 Documentation/en-us/SharedExamples.md
+0 −1 Documentation/ja/ArrangeActAssert.md
+0 −2 Documentation/ja/BehavioralTesting.md
+2 −2 Documentation/ja/InstallingQuick.md
+1 −1 Documentation/ja/MoreResources.md
+3 −3 Documentation/ja/SharedExamples.md
+75 −0 Documentation/zh-cn/SettingUpYourXcodeProject.md
+1 −1 Externals/Nimble
+3 −0 Gemfile
+67 −0 Gemfile.lock
+2 −1 Quick.podspec
+41 −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
+2 −2 README.md
+19 −24 Rakefile
+6 −8 Sources/Quick/DSL/World+DSL.swift
+18 −18 Sources/Quick/QuickSpec.m
+1 −0 Sources/Quick/World.h
+9 −0 Sources/Quick/World.swift
+19 −0 Sources/QuickTests/FunctionalTests/CrossReferencingSpecs.swift
+4 −0 Sources/QuickTests/Helpers/QCKSpecRunner.m
+29 −5 Sources/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.m
+2 −0 Sources/QuickTests/main.swift
+0 −3 circle.yml
+3 −20 script/release
+0 −3 script/travis-install-osx
+8 −4 script/travis-script-osx
64 changes: 42 additions & 22 deletions Heimdallr.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,9 @@
productReference = DC545DCD1A89F0F10051A575 /* HeimdallrTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
DC582F421BE1319F0017BE06 /* Heimdallr-Mac */ = {
DC582F421BE1319F0017BE06 /* Heimdallr-macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = DC582F541BE1319F0017BE06 /* Build configuration list for PBXNativeTarget "Heimdallr-Mac" */;
buildConfigurationList = DC582F541BE1319F0017BE06 /* Build configuration list for PBXNativeTarget "Heimdallr-macOS" */;
buildPhases = (
DC582F3E1BE1319F0017BE06 /* Sources */,
DC582F3F1BE1319F0017BE06 /* Frameworks */,
Expand All @@ -637,14 +637,14 @@
);
dependencies = (
);
name = "Heimdallr-Mac";
name = "Heimdallr-macOS";
productName = "Heimdallr-Mac";
productReference = DC582F431BE1319F0017BE06 /* Heimdallr.framework */;
productType = "com.apple.product-type.framework";
};
DC582F4B1BE1319F0017BE06 /* Heimdallr-MacTests */ = {
DC582F4B1BE1319F0017BE06 /* Heimdallr-macOSTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = DC582F571BE1319F0017BE06 /* Build configuration list for PBXNativeTarget "Heimdallr-MacTests" */;
buildConfigurationList = DC582F571BE1319F0017BE06 /* Build configuration list for PBXNativeTarget "Heimdallr-macOSTests" */;
buildPhases = (
DC582F481BE1319F0017BE06 /* Sources */,
DC582F491BE1319F0017BE06 /* Frameworks */,
Expand All @@ -655,7 +655,7 @@
dependencies = (
DC582F4F1BE1319F0017BE06 /* PBXTargetDependency */,
);
name = "Heimdallr-MacTests";
name = "Heimdallr-macOSTests";
productName = "Heimdallr-MacTests";
productReference = DC582F4C1BE1319F0017BE06 /* HeimdallrTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
Expand Down Expand Up @@ -696,9 +696,9 @@
productReference = DC582FC91BE13EB30017BE06 /* ReactiveHeimdallrTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
DC582FF41BE148610017BE06 /* ReactiveHeimdallr-Mac */ = {
DC582FF41BE148610017BE06 /* ReactiveHeimdallr-macOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = DC5830061BE148610017BE06 /* Build configuration list for PBXNativeTarget "ReactiveHeimdallr-Mac" */;
buildConfigurationList = DC5830061BE148610017BE06 /* Build configuration list for PBXNativeTarget "ReactiveHeimdallr-macOS" */;
buildPhases = (
DC582FF01BE148610017BE06 /* Sources */,
DC582FF11BE148610017BE06 /* Frameworks */,
Expand All @@ -709,14 +709,14 @@
);
dependencies = (
);
name = "ReactiveHeimdallr-Mac";
name = "ReactiveHeimdallr-macOS";
productName = "ReactiveHeimdallr-Mac";
productReference = DC582FF51BE148610017BE06 /* ReactiveHeimdallr.framework */;
productType = "com.apple.product-type.framework";
};
DC582FFD1BE148610017BE06 /* ReactiveHeimdallr-MacTests */ = {
DC582FFD1BE148610017BE06 /* ReactiveHeimdallr-macOSTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = DC5830091BE148610017BE06 /* Build configuration list for PBXNativeTarget "ReactiveHeimdallr-MacTests" */;
buildConfigurationList = DC5830091BE148610017BE06 /* Build configuration list for PBXNativeTarget "ReactiveHeimdallr-macOSTests" */;
buildPhases = (
DC582FFA1BE148610017BE06 /* Sources */,
DC582FFB1BE148610017BE06 /* Frameworks */,
Expand All @@ -727,7 +727,7 @@
dependencies = (
DC5830011BE148610017BE06 /* PBXTargetDependency */,
);
name = "ReactiveHeimdallr-MacTests";
name = "ReactiveHeimdallr-macOSTests";
productName = "ReactiveHeimdallr-MacTests";
productReference = DC582FFE1BE148610017BE06 /* ReactiveHeimdallrTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
Expand All @@ -745,15 +745,19 @@
TargetAttributes = {
DC545DC11A89F0F10051A575 = {
CreatedOnToolsVersion = 6.1.1;
LastSwiftMigration = 0800;
};
DC545DCC1A89F0F10051A575 = {
CreatedOnToolsVersion = 6.1.1;
LastSwiftMigration = 0800;
};
DC582F421BE1319F0017BE06 = {
CreatedOnToolsVersion = 7.1;
LastSwiftMigration = 0800;
};
DC582F4B1BE1319F0017BE06 = {
CreatedOnToolsVersion = 7.1;
LastSwiftMigration = 0800;
};
DC582FBF1BE13EB20017BE06 = {
CreatedOnToolsVersion = 7.1;
Expand Down Expand Up @@ -781,12 +785,12 @@
projectDirPath = "";
projectRoot = "";
targets = (
DC582F421BE1319F0017BE06 /* Heimdallr-Mac */,
DC582F4B1BE1319F0017BE06 /* Heimdallr-MacTests */,
DC582F421BE1319F0017BE06 /* Heimdallr-macOS */,
DC582F4B1BE1319F0017BE06 /* Heimdallr-macOSTests */,
DC545DC11A89F0F10051A575 /* Heimdallr-iOS */,
DC545DCC1A89F0F10051A575 /* Heimdallr-iOSTests */,
DC582FF41BE148610017BE06 /* ReactiveHeimdallr-Mac */,
DC582FFD1BE148610017BE06 /* ReactiveHeimdallr-MacTests */,
DC582FF41BE148610017BE06 /* ReactiveHeimdallr-macOS */,
DC582FFD1BE148610017BE06 /* ReactiveHeimdallr-macOSTests */,
DC582FBF1BE13EB20017BE06 /* ReactiveHeimdallr-iOS */,
DC582FC81BE13EB30017BE06 /* ReactiveHeimdallr-iOSTests */,
);
Expand Down Expand Up @@ -1011,7 +1015,7 @@
};
DC582F4F1BE1319F0017BE06 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DC582F421BE1319F0017BE06 /* Heimdallr-Mac */;
target = DC582F421BE1319F0017BE06 /* Heimdallr-macOS */;
targetProxy = DC582F4E1BE1319F0017BE06 /* PBXContainerItemProxy */;
};
DC582FCC1BE13EB30017BE06 /* PBXTargetDependency */ = {
Expand All @@ -1021,7 +1025,7 @@
};
DC5830011BE148610017BE06 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DC582FF41BE148610017BE06 /* ReactiveHeimdallr-Mac */;
target = DC582FF41BE148610017BE06 /* ReactiveHeimdallr-macOS */;
targetProxy = DC5830001BE148610017BE06 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -1070,6 +1074,7 @@
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
Expand All @@ -1083,6 +1088,7 @@
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand All @@ -1093,6 +1099,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = HeimdallrTests;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
Expand All @@ -1103,6 +1110,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = HeimdallrTests;
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand All @@ -1115,6 +1123,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
Expand All @@ -1127,6 +1136,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand All @@ -1137,6 +1147,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_NAME = HeimdallrTests;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
Expand All @@ -1147,6 +1158,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_NAME = HeimdallrTests;
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand All @@ -1161,6 +1173,7 @@
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = ReactiveHeimdallr;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
Expand All @@ -1175,6 +1188,7 @@
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = ReactiveHeimdallr;
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand All @@ -1185,6 +1199,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = ReactiveHeimdallrTests;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
Expand All @@ -1195,6 +1210,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = ReactiveHeimdallrTests;
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand All @@ -1208,6 +1224,7 @@
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_NAME = ReactiveHeimdallr;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
Expand All @@ -1221,6 +1238,7 @@
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_NAME = ReactiveHeimdallr;
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand All @@ -1231,6 +1249,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_NAME = ReactiveHeimdallrTests;
SWIFT_VERSION = 2.3;
};
name = Debug;
};
Expand All @@ -1241,6 +1260,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
PRODUCT_NAME = ReactiveHeimdallrTests;
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand Down Expand Up @@ -1274,7 +1294,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
DC582F541BE1319F0017BE06 /* Build configuration list for PBXNativeTarget "Heimdallr-Mac" */ = {
DC582F541BE1319F0017BE06 /* Build configuration list for PBXNativeTarget "Heimdallr-macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
DC582F551BE1319F0017BE06 /* Debug */,
Expand All @@ -1283,7 +1303,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
DC582F571BE1319F0017BE06 /* Build configuration list for PBXNativeTarget "Heimdallr-MacTests" */ = {
DC582F571BE1319F0017BE06 /* Build configuration list for PBXNativeTarget "Heimdallr-macOSTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
DC582F581BE1319F0017BE06 /* Debug */,
Expand All @@ -1310,7 +1330,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
DC5830061BE148610017BE06 /* Build configuration list for PBXNativeTarget "ReactiveHeimdallr-Mac" */ = {
DC5830061BE148610017BE06 /* Build configuration list for PBXNativeTarget "ReactiveHeimdallr-macOS" */ = {
isa = XCConfigurationList;
buildConfigurations = (
DC5830071BE148610017BE06 /* Debug */,
Expand All @@ -1319,7 +1339,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
DC5830091BE148610017BE06 /* Build configuration list for PBXNativeTarget "ReactiveHeimdallr-MacTests" */ = {
DC5830091BE148610017BE06 /* Build configuration list for PBXNativeTarget "ReactiveHeimdallr-macOSTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
DC58300A1BE148610017BE06 /* Debug */,
Expand Down
10 changes: 5 additions & 5 deletions ...areddata/xcschemes/Heimdallr-Mac.xcscheme → ...eddata/xcschemes/Heimdallr-macOS.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC582F421BE1319F0017BE06"
BuildableName = "Heimdallr.framework"
BlueprintName = "Heimdallr-Mac"
BlueprintName = "Heimdallr-macOS"
ReferencedContainer = "container:Heimdallr.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -105,7 +105,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC582F4B1BE1319F0017BE06"
BuildableName = "HeimdallrTests.xctest"
BlueprintName = "Heimdallr-MacTests"
BlueprintName = "Heimdallr-macOSTests"
ReferencedContainer = "container:Heimdallr.xcodeproj">
</BuildableReference>
</TestableReference>
Expand All @@ -115,7 +115,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC582F421BE1319F0017BE06"
BuildableName = "Heimdallr.framework"
BlueprintName = "Heimdallr-Mac"
BlueprintName = "Heimdallr-macOS"
ReferencedContainer = "container:Heimdallr.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -137,7 +137,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC582F421BE1319F0017BE06"
BuildableName = "Heimdallr.framework"
BlueprintName = "Heimdallr-Mac"
BlueprintName = "Heimdallr-macOS"
ReferencedContainer = "container:Heimdallr.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -155,7 +155,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "DC582F421BE1319F0017BE06"
BuildableName = "Heimdallr.framework"
BlueprintName = "Heimdallr-Mac"
BlueprintName = "Heimdallr-macOS"
ReferencedContainer = "container:Heimdallr.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
Loading

0 comments on commit 7eef787

Please sign in to comment.