Merge pull request #110 from ugoArangino/remove-reactive-cocoa

Remove reactive cocoa
trivago · Oct 20, 2017 · b6b8ea3 · b6b8ea3
2 parents 001469b + c9815d8
commit b6b8ea3
Show file tree

Hide file tree

Showing 48 changed files with 23 additions and 1,002 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,12 +13,3 @@
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
-[submodule "Carthage/Checkouts/ReactiveSwift"]
-	path = Carthage/Checkouts/ReactiveSwift
-	url = https://github.com/ReactiveCocoa/ReactiveSwift.git
-[submodule "Carthage/Checkouts/ReactiveObjC"]
-	path = Carthage/Checkouts/ReactiveObjC
-	url = https://github.com/ReactiveCocoa/ReactiveObjC.git
-[submodule "Carthage/Checkouts/ReactiveObjCBridge"]
-	path = Carthage/Checkouts/ReactiveObjCBridge
-	url = https://github.com/ReactiveCocoa/ReactiveObjCBridge.git
diff --git a/Cartfile b/Cartfile
@@ -1,6 +1,2 @@
 # Core
-github "antitypical/Result" ~> 3.2.2
-
-# ReactiveCocoa
-github "ReactiveCocoa/ReactiveSwift" ~> 1.1.5
-github "ReactiveCocoa/ReactiveObjCBridge" ~> 1.0.2
+github "antitypical/Result" ~> 3.2
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,4 +1,8 @@
-github "jspahrsummers/xcconfigs" ~> 0.10
-github "Quick/Quick" ~> 0.10.0
-github "Quick/Nimble" ~> 5.1.1
-github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
+github "jspahrsummers/xcconfigs" ~> 0.11
+github "AliSoftware/OHHTTPStubs" ~> 6.0
+
+# Specifications
+github "Quick/Quick" ~> 1.1.0
+
+# Matchers
+github "Quick/Nimble" ~> 7.0.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,8 +1,5 @@
-github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
-github "Quick/Nimble" "v5.1.1"
-github "Quick/Quick" "v0.10.0"
-github "ReactiveCocoa/ReactiveObjC" "2.1.2"
-github "ReactiveCocoa/ReactiveObjCBridge" "1.0.2"
-github "ReactiveCocoa/ReactiveSwift" "1.1.5"
-github "antitypical/Result" "3.2.3"
-github "jspahrsummers/xcconfigs" "0.10"
+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 "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/ReactiveObjC b/Carthage/Checkouts/ReactiveObjC
diff --git a/Carthage/Checkouts/ReactiveObjCBridge b/Carthage/Checkouts/ReactiveObjCBridge
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
diff --git a/Heimdallr.podspec b/Heimdallr.podspec
@@ -28,12 +28,4 @@ Pod::Spec.new do |spec|
 
     subspec.source_files = 'Heimdallr/Core/*.swift'
   end
-
-  spec.subspec 'ReactiveCocoa' do |subspec|
-    subspec.dependency 'Heimdallr/Core'
-    subspec.dependency 'ReactiveSwift', '~> 1.0'
-    subspec.dependency 'ReactiveObjCBridge', '~> 1.0'
-
-    subspec.source_files = 'Heimdallr/ReactiveCocoa/*.swift'
-  end
 end
diff --git a/Heimdallr.xcodeproj/project.pbxproj b/Heimdallr.xcodeproj/project.pbxproj
diff --git a/Heimdallr.xcworkspace/contents.xcworkspacedata b/Heimdallr.xcworkspace/contents.xcworkspacedata
diff --git a/Heimdallr/Core/Heimdallr.swift → Heimdallr/Heimdallr.swift b/Heimdallr/Core/Heimdallr.swift → Heimdallr/Heimdallr.swift
diff --git a/Heimdallr/Core/HeimdallrHTTPClient.swift → Heimdallr/HeimdallrHTTPClient.swift b/Heimdallr/Core/HeimdallrHTTPClient.swift → Heimdallr/HeimdallrHTTPClient.swift
diff --git a/.../Core/HeimdallrHTTPClientURLSession.swift → ...dallr/HeimdallrHTTPClientURLSession.swift b/.../Core/HeimdallrHTTPClientURLSession.swift → ...dallr/HeimdallrHTTPClientURLSession.swift
diff --git a/...imdallrResourceRequestAuthenticator.swift → ...imdallrResourceRequestAuthenticator.swift b/...imdallrResourceRequestAuthenticator.swift → ...imdallrResourceRequestAuthenticator.swift
diff --git a/...uthenticatorHTTPAuthorizationHeader.swift → ...uthenticatorHTTPAuthorizationHeader.swift b/...uthenticatorHTTPAuthorizationHeader.swift → ...uthenticatorHTTPAuthorizationHeader.swift
diff --git a/Heimdallr/Core/OAuthAccessToken.swift → Heimdallr/OAuthAccessToken.swift b/Heimdallr/Core/OAuthAccessToken.swift → Heimdallr/OAuthAccessToken.swift
diff --git a/.../Core/OAuthAccessTokenDefaultParser.swift → ...dallr/OAuthAccessTokenDefaultParser.swift b/.../Core/OAuthAccessTokenDefaultParser.swift → ...dallr/OAuthAccessTokenDefaultParser.swift
diff --git a/.../Core/OAuthAccessTokenKeychainStore.swift → ...dallr/OAuthAccessTokenKeychainStore.swift b/.../Core/OAuthAccessTokenKeychainStore.swift → ...dallr/OAuthAccessTokenKeychainStore.swift
diff --git a/Heimdallr/Core/OAuthAccessTokenParser.swift → Heimdallr/OAuthAccessTokenParser.swift b/Heimdallr/Core/OAuthAccessTokenParser.swift → Heimdallr/OAuthAccessTokenParser.swift
diff --git a/Heimdallr/Core/OAuthAccessTokenStore.swift → Heimdallr/OAuthAccessTokenStore.swift b/Heimdallr/Core/OAuthAccessTokenStore.swift → Heimdallr/OAuthAccessTokenStore.swift
diff --git a/Heimdallr/Core/OAuthAuthorizationGrant.swift → Heimdallr/OAuthAuthorizationGrant.swift b/Heimdallr/Core/OAuthAuthorizationGrant.swift → Heimdallr/OAuthAuthorizationGrant.swift
diff --git a/Heimdallr/Core/OAuthClientCredentials.swift → Heimdallr/OAuthClientCredentials.swift b/Heimdallr/Core/OAuthClientCredentials.swift → Heimdallr/OAuthClientCredentials.swift
diff --git a/Heimdallr/Core/OAuthError.swift → Heimdallr/OAuthError.swift b/Heimdallr/Core/OAuthError.swift → Heimdallr/OAuthError.swift
diff --git a/Heimdallr/ReactiveCocoa/Heimdallr+ReactiveCocoa.swift b/Heimdallr/ReactiveCocoa/Heimdallr+ReactiveCocoa.swift
diff --git a/Heimdallr/Supporting Files/ReactiveHeimdallr.h b/Heimdallr/Supporting Files/ReactiveHeimdallr.h
diff --git a/Heimdallr/Core/URLRequestExtensions.swift → Heimdallr/URLRequestExtensions.swift b/Heimdallr/Core/URLRequestExtensions.swift → Heimdallr/URLRequestExtensions.swift
diff --git a/...nticatorHTTPAuthorizationHeaderSpec.swift → ...nticatorHTTPAuthorizationHeaderSpec.swift b/...nticatorHTTPAuthorizationHeaderSpec.swift → ...nticatorHTTPAuthorizationHeaderSpec.swift
diff --git a/HeimdallrTests/Core/HeimdallrSpec.swift → HeimdallrTests/HeimdallrSpec.swift b/HeimdallrTests/Core/HeimdallrSpec.swift → HeimdallrTests/HeimdallrSpec.swift
diff --git a/.../Core/JSON Responses/authorize-error.json → ...Tests/JSON Responses/authorize-error.json b/.../Core/JSON Responses/authorize-error.json → ...Tests/JSON Responses/authorize-error.json
diff --git a/...ON Responses/authorize-invalid-token.json → ...ON Responses/authorize-invalid-token.json b/...ON Responses/authorize-invalid-token.json → ...ON Responses/authorize-invalid-token.json
diff --git a/...SON Responses/authorize-invalid-type.json → ...SON Responses/authorize-invalid-type.json b/...SON Responses/authorize-invalid-type.json → ...SON Responses/authorize-invalid-type.json
diff --git a/...ore/JSON Responses/authorize-invalid.json → ...sts/JSON Responses/authorize-invalid.json b/...ore/JSON Responses/authorize-invalid.json → ...sts/JSON Responses/authorize-invalid.json
diff --git a/.../Core/JSON Responses/authorize-valid.json → ...Tests/JSON Responses/authorize-valid.json b/.../Core/JSON Responses/authorize-valid.json → ...Tests/JSON Responses/authorize-valid.json
diff --git a/... Responses/request-invalid-norefresh.json → ... Responses/request-invalid-norefresh.json b/... Responses/request-invalid-norefresh.json → ... Responses/request-invalid-norefresh.json
diff --git a/.../Core/JSON Responses/request-invalid.json → ...Tests/JSON Responses/request-invalid.json b/.../Core/JSON Responses/request-invalid.json → ...Tests/JSON Responses/request-invalid.json
diff --git a/...ts/Core/JSON Responses/request-valid.json → ...lrTests/JSON Responses/request-valid.json b/...ts/Core/JSON Responses/request-valid.json → ...lrTests/JSON Responses/request-valid.json
diff --git a/...e/OAuthAccessTokenKeychainStoreSpec.swift → ...s/OAuthAccessTokenKeychainStoreSpec.swift b/...e/OAuthAccessTokenKeychainStoreSpec.swift → ...s/OAuthAccessTokenKeychainStoreSpec.swift
diff --git a/...allrTests/Core/OAuthAccessTokenSpec.swift → HeimdallrTests/OAuthAccessTokenSpec.swift b/...allrTests/Core/OAuthAccessTokenSpec.swift → HeimdallrTests/OAuthAccessTokenSpec.swift
+29 −0		.github/ISSUE_TEMPLATE.md
+17 −0		.github/PULL_REQUEST_TEMPLATE.md
+5 −3		.travis.yml
+18 −0		CHANGELOG.md
+10 −10		Examples/ObjC/Podfile.lock
+3 −3		Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+10 −10		Examples/ObjC/Pods/Manifest.lock
+133 −122		Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
+8 −0		Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch
+1 −0		Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
+10 −2		Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-frameworks.sh
+3 −0		Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh
+0 −1		Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig
+0 −1		Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.release.xcconfig
+1 −1		Examples/Swift/MainViewController.swift
+3 −7		Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+12 −12		Examples/Swift/Podfile.lock
+3 −3		Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+12 −12		Examples/Swift/Pods/Manifest.lock
+107 −93		Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		Examples/Swift/Pods/Target Support Files/OHHTTPStubs/Info.plist
+8 −0		Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-prefix.pch
+8 −0		Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-umbrella.h
+1 −0		Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
+10 −2		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-frameworks.sh
+3 −0		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh
+8 −0		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-umbrella.h
+0 −1		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig
+0 −1		Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.release.xcconfig
+2 −2		OHHTTPStubs.podspec
+8 −3		OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs tvOS Framework.xcscheme
+173 −94		OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
+109 −9		OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift
+58 −34		README.md
+36 −0		.github/ISSUE_TEMPLATE
+14 −0		.github/PULL_REQUEST_TEMPLATE
+2 −1		.gitignore
+2 −0		.hound.yml
+1 −1		.swift-version
+8 −0		.swiftlint.yml
+21 −5		.travis.yml
+53 −0		Dangerfile
+1 −0		Documentation/README.md
+1 −18		Documentation/en-us/InstallingQuick.md
+9 −3		Documentation/en-us/SettingUpYourXcodeProject.md
+3 −3		Documentation/en-us/SharedExamples.md
+34 −34		Documentation/en-us/TestUsingTestDoubles.md
+1 −1		Documentation/ja/ConfiguringQuick.md
+78 −0		Documentation/pt-br/BehavioralTesting.md
+39 −0		Documentation/pt-br/README.md
+116 −0		Documentation/pt-br/SharedExamples.md
+1 −0		Documentation/zh-cn/README.md
+113 −0		Documentation/zh-cn/SharedExamples.md
+1 −1		Externals/Nimble
+2 −0		Gemfile
+72 −26		Gemfile.lock
+43 −14		Package.swift
+40 −0		Package@swift-4.swift
+1 −1		Quick Templates/Quick Configuration Class.xctemplate/Swift/___FILEBASENAME___.swift
+1 −1		Quick.podspec
+542 −91		Quick.xcodeproj/project.pbxproj
+31 −5		Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+31 −5		Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+31 −5		Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+29 −10		README.md
+4 −3		Rakefile
+17 −0		Sources/Quick/Behavior.swift
+22 −7		Sources/Quick/Callsite.swift
+5 −5		Sources/Quick/Configuration/Configuration.swift
+32 −1		Sources/Quick/Configuration/QuickConfiguration.swift
+56 −12		Sources/Quick/DSL/DSL.swift
+50 −14		Sources/Quick/DSL/World+DSL.swift
+1 −1		Sources/Quick/ErrorUtility.swift
+31 −11		Sources/Quick/Example.swift
+11 −15		Sources/Quick/ExampleGroup.swift
+14 −1		Sources/Quick/ExampleMetadata.swift
+14 −1		Sources/Quick/Filter.swift
+3 −3		Sources/Quick/Hooks/Closures.swift
+3 −3		Sources/Quick/Hooks/ExampleHooks.swift
+10 −1		Sources/Quick/NSBundle+CurrentTestBundle.swift
+33 −0		Sources/Quick/NSString+C99ExtendedIdentifier.swift
+11 −6		Sources/Quick/QuickMain.swift
+2 −2		Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+78 −4		Sources/Quick/QuickSpec.swift
+6 −6		Sources/Quick/QuickTestSuite.swift
+0 −12		Sources/Quick/String+FileName.swift
+12 −0		Sources/Quick/URL+FileName.swift
+26 −11		Sources/Quick/World.swift
+0 −17		Sources/QuickObjectiveC/NSString+QCKSelectorName.h
+0 −37		Sources/QuickObjectiveC/NSString+QCKSelectorName.m
+9 −38		Sources/QuickObjectiveC/QuickSpec.m
+55 −0		Sources/QuickSpecBase/QuickSpecBase.m
+11 −0		Sources/QuickSpecBase/include/QuickSpecBase.h
+5 −7		Tests/LinuxMain.swift
+32 −0		Tests/QuickTests/QuickAfterSuiteTests/AfterSuiteTests+ObjC.m
+26 −0		Tests/QuickTests/QuickAfterSuiteTests/AfterSuiteTests.swift
+24 −0		Tests/QuickTests/QuickAfterSuiteTests/Info.plist
+22 −8		Tests/QuickTests/QuickFocusedTests/FocusedTests.swift
+0 −1		Tests/QuickTests/QuickTestHelpers/TestRun.swift
+4 −4		Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+20 −0		Tests/QuickTests/QuickTests/Fixtures/FunctionalTests_BehaviorTests_Behaviors.swift
+1 −1		Tests/QuickTests/QuickTests/Fixtures/FunctionalTests_SharedExamplesTests_SharedExamples.swift
+26 −27		Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+0 −45		Tests/QuickTests/QuickTests/FunctionalTests/AfterSuiteTests.swift
+23 −24		Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/BeforeSuiteTests.swift
+59 −0		Tests/QuickTests/QuickTests/FunctionalTests/BehaviorTests.swift
+30 −0		Tests/QuickTests/QuickTests/FunctionalTests/BundleModuleNameTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/Configuration/AfterEach/Configuration+AfterEachTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/Configuration/BeforeEach/Configuration+BeforeEachTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+2 −2		Tests/QuickTests/QuickTests/FunctionalTests/CrossReferencingSpecs.swift
+2 −2		Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+14 −16		Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+0 −42		Tests/QuickTests/QuickTests/FunctionalTests/ObjC/AfterSuiteTests+ObjC.m
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/ObjC/FailureUsingXCTAssertTests+ObjC.m
+9 −2		Tests/QuickTests/QuickTests/FunctionalTests/PendingTests.swift
+1 −1		Tests/QuickTests/QuickTests/FunctionalTests/SharedExamples+BeforeEachTests.swift
+3 −3		Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+1 −1		Tests/QuickTests/QuickTests/Helpers/QuickTestsBridgingHeader.h