trivago · nrohwedder · Oct 30, 2018 · Oct 30, 2018
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
 # Core
-github "antitypical/Result" ~> 3.2
+github "antitypical/Result" ~> 4.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "AliSoftware/OHHTTPStubs" "6.0.0"
-github "Quick/Nimble" "v7.0.2"
-github "Quick/Quick" "v1.2.0"
-github "antitypical/Result" "3.2.4"
+github "AliSoftware/OHHTTPStubs" "6.1.0"
+github "Quick/Nimble" "v7.3.1"
+github "Quick/Quick" "v1.3.2"
+github "antitypical/Result" "4.0.0"
 github "jspahrsummers/xcconfigs" "0.11"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
diff --git a/Heimdallr.podspec b/Heimdallr.podspec
@@ -19,13 +19,14 @@ Pod::Spec.new do |spec|
 
   spec.ios.deployment_target = '9.0'
   spec.osx.deployment_target = '10.9'
+  spec.swift_version = "4.0"
 
   spec.default_subspec = 'Core'
 
   spec.subspec 'Core' do |subspec|
-    subspec.dependency 'Result', '~> 3.0'
+    subspec.dependency 'Result', '~> 4.0'
     subspec.framework = 'Foundation'
 
-    subspec.source_files = 'Heimdallr/Core/*.swift'
+    subspec.source_files = 'Heimdallr/*.{swift}'
   end
 end
diff --git a/Heimdallr.xcodeproj/project.pbxproj b/Heimdallr.xcodeproj/project.pbxproj
@@ -737,8 +737,9 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -752,8 +753,9 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -763,6 +765,7 @@
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = HeimdallrTests;
 				SWIFT_VERSION = 3.0;
@@ -775,6 +778,7 @@
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = HeimdallrTests;
 				SWIFT_VERSION = 3.0;
@@ -790,7 +794,7 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -803,7 +807,7 @@
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
+6 −12		.travis.yml
+26 −0		CHANGELOG.md
+10 −2		Examples/ObjC/MainViewController.m
+130 −87		Examples/ObjC/MainViewController.xib
+6 −5		Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+5 −0		Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+5 −0		Examples/ObjC/OHHTTPStubsDemo.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+1 −1		Examples/ObjC/Podfile
+11 −11		Examples/ObjC/Podfile.lock
+3 −3		Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+11 −11		Examples/ObjC/Pods/Manifest.lock
+209 −276		Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
+17 −4		Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-frameworks.sh
+16 −9		Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh
+1 −0		Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig
+1 −0		Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.release.xcconfig
+39 −34		Examples/Swift/Main.storyboard
+8 −8		Examples/Swift/MainViewController.swift
+7 −1		Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+7 −0		Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+5 −0		Examples/Swift/OHHTTPStubsDemo.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+11 −11		Examples/Swift/Podfile.lock
+3 −3		Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+11 −11		Examples/Swift/Pods/Manifest.lock
+278 −369		Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist
+19 −6		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-frameworks.sh
+16 −9		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh
+1 −0		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig
+1 −0		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.release.xcconfig
+2 −2		OHHTTPStubs.podspec
+17 −3		OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+3 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
+3 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
+3 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
+3 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs tvOS Framework.xcscheme
+6 −6		OHHTTPStubs/Sources/HTTPMessage/OHHTTPStubsResponse+HTTPMessage.m
+1 −1		OHHTTPStubs/Sources/JSON/OHHTTPStubsResponse+JSON.m
+26 −26		OHHTTPStubs/Sources/Mocktail/OHHTTPStubs+Mocktail.m
+8 −0		OHHTTPStubs/Sources/OHHTTPStubs.h
+46 −17		OHHTTPStubs/Sources/OHHTTPStubs.m
+4 −4		OHHTTPStubs/Sources/OHHTTPStubsResponse.m
+56 −1		OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
+22 −22		OHHTTPStubs/UnitTests/Test Suites/AFNetworkingTests.m
+21 −20		OHHTTPStubs/UnitTests/Test Suites/MocktailTests.m
+44 −44		OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionDelegateTests.m
+13 −13		OHHTTPStubs/UnitTests/Test Suites/NSURLConnectionTests.m
+268 −108		OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m
+37 −37		OHHTTPStubs/UnitTests/Test Suites/NilValuesTests.m
+1 −1		OHHTTPStubs/UnitTests/Test Suites/OHPathHelpersTests.m
+131 −29		OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift
+6 −6		OHHTTPStubs/UnitTests/Test Suites/TimingTests.m
+8 −8		OHHTTPStubs/UnitTests/Test Suites/WithContentsOfURLTests.m
+1 −1		README.md
+2 −2		Rakefile
+2 −2		.gitignore
+9 −5		.travis.yml
+1 −0		Documentation/README.md
+2 −2		Documentation/en-us/ConfiguringQuick.md
+14 −14		Documentation/en-us/NimbleAssertions.md
+1 −1		Documentation/en-us/QuickExamplesAndGroups.md
+75 −0		Documentation/en-us/TestingApps.md
+14 −14		Documentation/ja/NimbleAssertions.md
+1 −1		Documentation/ja/QuickExamplesAndGroups.md
+203 −0		Documentation/ko-kr/ArrangeActAssert.md
+80 −0		Documentation/ko-kr/BehavioralTesting.md
+99 −0		Documentation/ko-kr/ConfiguringQuick.md
+25 −0		Documentation/ko-kr/InstallingFileTemplates.md
+141 −0		Documentation/ko-kr/InstallingQuick.md
+25 −0		Documentation/ko-kr/MoreResources.md
+97 −0		Documentation/ko-kr/NimbleAssertions.md
+462 −0		Documentation/ko-kr/QuickExamplesAndGroups.md
+49 −0		Documentation/ko-kr/QuickInObjectiveC.md
+35 −0		Documentation/ko-kr/README.md
+80 −0		Documentation/ko-kr/SettingUpYourXcodeProject.md
+116 −0		Documentation/ko-kr/SharedExamples.md
+129 −0		Documentation/ko-kr/TestUsingTestDoubles.md
+173 −0		Documentation/ko-kr/TestingApps.md
+10 −0		Documentation/ko-kr/Troubleshooting.md
+12 −12		Documentation/zh-cn/NimbleAssertions.md
+1 −1		Documentation/zh-cn/QuickExamplesAndGroups.md
+1 −1		Externals/Nimble
+1 −1		Gemfile
+40 −36		Gemfile.lock
+16 −0		Package.resolved
+6 −2		Quick.podspec
+59 −36		Quick.xcodeproj/project.pbxproj
+1 −3		Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+1 −3		Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+1 −3		Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+8 −0		Quick.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+5 −0		Rakefile
+3 −3		Sources/Quick/Configuration/QuickConfiguration.swift
+9 −4		Sources/Quick/DSL/World+DSL.swift
+3 −0		Sources/Quick/Example.swift
+19 −3		Sources/Quick/NSString+C99ExtendedIdentifier.swift
+14 −2		Sources/Quick/QuickSpec.swift
+1 −1		Sources/Quick/World.swift
+6 −1		Sources/QuickObjectiveC/Configuration/QuickConfiguration.m
+6 −2		Sources/QuickObjectiveC/DSL/QCKDSL.m
+0 −20		Sources/QuickObjectiveC/DSL/World+DSL.h
+6 −0		Sources/QuickObjectiveC/QuickSpec.h
+11 −3		Sources/QuickObjectiveC/QuickSpec.m
+0 −18		Sources/QuickObjectiveC/World.h
+5 −0		Sources/QuickObjectiveC/XCTestSuite+QuickTestSuiteBuilder.m
+25 −0		Tests/QuickTests/QuickTests/FunctionalTests/CurrentSpecTests.swift
+0 −1		Tests/QuickTests/QuickTests/Helpers/QCKSpecRunner.m
+7 −1		Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.h
+5 −13		Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.m
+1 −1		.swift-version
+29 −11		.travis.yml
+8 −4		Package.swift
+1 −1		README.md
+4 −1		Result.podspec
+64 −22		Result.xcodeproj/project.pbxproj
+8 −0		Result.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+1 −1		Result.xcodeproj/xcshareddata/xcschemes/Result-Mac.xcscheme
+1 −1		Result.xcodeproj/xcshareddata/xcschemes/Result-iOS.xcscheme
+1 −1		Result.xcodeproj/xcshareddata/xcschemes/Result-tvOS.xcscheme
+1 −1		Result.xcodeproj/xcshareddata/xcschemes/Result-watchOS.xcscheme
+46 −0		Result/AnyError.swift
+1 −1		Result/Info.plist
+10 −0		Result/NoError.swift
+59 −139		Result/Result.swift
+60 −111		Result/ResultProtocol.swift
+5 −5		Tests/LinuxMain.swift
+12 −0		Tests/ResultTests/AnyErrorTests.swift
+1 −1		Tests/ResultTests/Info.plist
+11 −0		Tests/ResultTests/NoErrorTests.swift
+13 −127		Tests/ResultTests/ResultTests.swift
+57 −0		Tests/ResultTests/XCTestManifests.swift