Skip to content

Commit

Permalink
update to swift 5 + update all dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
fbeeper committed Apr 20, 2019
1 parent b289d47 commit 70d3d00
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 60 deletions.
8 changes: 4 additions & 4 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github "jspahrsummers/xcconfigs" ~> 0.11
github "AliSoftware/OHHTTPStubs" ~> 6.0
github "jspahrsummers/xcconfigs" ~> 1.0
github "AliSoftware/OHHTTPStubs" ~> 7.0

# Specifications
github "Quick/Quick" ~> 1.1.0
github "Quick/Quick" ~> 2.1.0

# Matchers
github "Quick/Nimble" ~> 7.0.0
github "Quick/Nimble" ~> 8.0.1
8 changes: 4 additions & 4 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "AliSoftware/OHHTTPStubs" "6.1.0"
github "Quick/Nimble" "v7.3.2"
github "Quick/Quick" "v1.3.2"
github "AliSoftware/OHHTTPStubs" "7.0.0"
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.1.0"
github "antitypical/Result" "4.1.0"
github "jspahrsummers/xcconfigs" "0.11"
github "jspahrsummers/xcconfigs" "1.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 97 files
+1 −1 .swift-version
+16 −4 .swiftlint.yml
+24 −53 .travis.yml
+1 −1 Gemfile
+24 −24 Gemfile.lock
+4 −1 Nimble.podspec
+24 −4 Nimble.xcodeproj/project.pbxproj
+8 −0 Nimble.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+16 −6 Package.swift
+0 −22 [email protected]
+7 −22 README.md
+1 −0 Sources/Nimble/Adapters/AdapterProtocols.swift
+30 −3 Sources/Nimble/Adapters/AssertionRecorder.swift
+5 −1 Sources/Nimble/Adapters/NMBExpectation.swift
+3 −1 Sources/Nimble/Adapters/NMBObjCMatcher.swift
+2 −7 Sources/Nimble/Adapters/NimbleEnvironment.swift
+6 −7 Sources/Nimble/Adapters/NimbleXCTestHandler.swift
+1 −1 Sources/Nimble/Adapters/NonObjectiveC/ExceptionCapture.swift
+10 −4 Sources/Nimble/DSL+Wait.swift
+11 −7 Sources/Nimble/DSL.swift
+16 −13 Sources/Nimble/ExpectationMessage.swift
+2 −0 Sources/Nimble/Expression.swift
+1 −0 Sources/Nimble/FailureMessage.swift
+2 −1 Sources/Nimble/Matchers/AllPass.swift
+4 −2 Sources/Nimble/Matchers/Async.swift
+1 −1 Sources/Nimble/Matchers/BeAKindOf.swift
+2 −2 Sources/Nimble/Matchers/BeAnInstanceOf.swift
+8 −1 Sources/Nimble/Matchers/BeCloseTo.swift
+25 −4 Sources/Nimble/Matchers/BeEmpty.swift
+4 −4 Sources/Nimble/Matchers/BeGreaterThan.swift
+4 −4 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+8 −32 Sources/Nimble/Matchers/BeIdenticalTo.swift
+4 −4 Sources/Nimble/Matchers/BeLessThan.swift
+4 −4 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+17 −30 Sources/Nimble/Matchers/BeLogical.swift
+4 −4 Sources/Nimble/Matchers/BeNil.swift
+7 −5 Sources/Nimble/Matchers/BeVoid.swift
+8 −8 Sources/Nimble/Matchers/BeginWith.swift
+66 −17 Sources/Nimble/Matchers/Contain.swift
+13 −13 Sources/Nimble/Matchers/ContainElementSatisfying.swift
+16 −0 Sources/Nimble/Matchers/ElementsEqual.swift
+7 −6 Sources/Nimble/Matchers/EndWith.swift
+42 −114 Sources/Nimble/Matchers/Equal.swift
+18 −9 Sources/Nimble/Matchers/HaveCount.swift
+1 −1 Sources/Nimble/Matchers/Match.swift
+8 −5 Sources/Nimble/Matchers/MatcherProtocols.swift
+5 −32 Sources/Nimble/Matchers/PostNotification.swift
+3 −2 Sources/Nimble/Matchers/Predicate.swift
+9 −3 Sources/Nimble/Matchers/RaisesException.swift
+7 −3 Sources/Nimble/Matchers/SatisfyAllOf.swift
+7 −3 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+3 −4 Sources/Nimble/Matchers/ThrowAssertion.swift
+13 −19 Sources/Nimble/Utils/Await.swift
+4 −2 Sources/Nimble/Utils/Functional.swift
+4 −15 Sources/Nimble/Utils/Stringers.swift
+4 −33 Tests/LinuxMain.swift
+15 −53 Tests/NimbleTests/AsynchronousTest.swift
+15 −5 Tests/NimbleTests/Helpers/XCTestCaseProvider.swift
+7 −2 Tests/NimbleTests/Helpers/utils.swift
+0 −11 Tests/NimbleTests/Matchers/AllPassTest.swift
+4 −18 Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+0 −9 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+18 −36 Tests/NimbleTests/Matchers/BeCloseToTest.swift
+66 −14 Tests/NimbleTests/Matchers/BeEmptyTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeGreaterThanTest.swift
+0 −11 Tests/NimbleTests/Matchers/BeIdenticalToObjectTest.swift
+0 −11 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeLessThanTest.swift
+0 −38 Tests/NimbleTests/Matchers/BeLogicalTest.swift
+0 −6 Tests/NimbleTests/Matchers/BeNilTest.swift
+0 −6 Tests/NimbleTests/Matchers/BeVoidTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeginWithTest.swift
+0 −14 Tests/NimbleTests/Matchers/ContainElementSatisfyingTest.swift
+62 −12 Tests/NimbleTests/Matchers/ContainTest.swift
+27 −0 Tests/NimbleTests/Matchers/ElementsEqualTest.swift
+0 −7 Tests/NimbleTests/Matchers/EndWithTest.swift
+1 −18 Tests/NimbleTests/Matchers/EqualTest.swift
+39 −20 Tests/NimbleTests/Matchers/HaveCountTest.swift
+4 −12 Tests/NimbleTests/Matchers/MatchErrorTest.swift
+0 −10 Tests/NimbleTests/Matchers/MatchTest.swift
+0 −12 Tests/NimbleTests/Matchers/PostNotificationTest.swift
+1 −11 Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+0 −7 Tests/NimbleTests/Matchers/SatisfyAllOfTest.swift
+0 −7 Tests/NimbleTests/Matchers/SatisfyAnyOfTest.swift
+1 −12 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+2 −12 Tests/NimbleTests/Matchers/ThrowErrorTest.swift
+0 −6 Tests/NimbleTests/Matchers/ToSucceedTest.swift
+0 −19 Tests/NimbleTests/SynchronousTest.swift
+36 −29 Tests/NimbleTests/UserDescriptionTest.swift
+387 −0 Tests/NimbleTests/XCTestManifests.swift
+5 −0 Tests/NimbleTests/objc/ObjCAsyncTest.m
+9 −0 Tests/NimbleTests/objc/ObjCContainTest.m
+0 −1 Tests/NimbleTests/objc/ObjCEndWithTest.m
+9 −0 Tests/NimbleTests/objc/ObjCHaveCountTest.m
+7 −3 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/OHHTTPStubs
Submodule OHHTTPStubs updated 73 files
+1 −0 .gitignore
+17 −8 .travis.yml
+30 −0 CHANGELOG.md
+0 −7 Examples/ObjC/MainViewController.m
+17 −33 Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+1 −3 Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+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
+269 −254 Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
+4 −5 Examples/ObjC/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
+3 −4 Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig
+3 −4 Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.release.xcconfig
+9 −2 Examples/Swift/AppDelegate.swift
+21 −21 Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+1 −3 Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+11 −11 Examples/Swift/Podfile.lock
+3 −3 Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+11 −11 Examples/Swift/Pods/Manifest.lock
+386 −347 Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
+1 −1 Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Info.plist
+4 −6 Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
+26 −0 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-Info.plist
+64 −13 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-frameworks.sh
+6 −6 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.debug.xcconfig
+6 −6 Examples/Swift/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo.release.xcconfig
+2 −2 OHHTTPStubs.podspec
+45 −165 OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+1 −3 OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
+1 −3 OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
+1 −3 OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
+1 −3 OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs tvOS Framework.xcscheme
+30 −0 OHHTTPStubs/OHHTTPStubsProject.xcconfig
+1 −1 OHHTTPStubs/Podfile
+6 −2 OHHTTPStubs/Podfile.lock
+6 −2 OHHTTPStubs/Pods/Manifest.lock
+782 −958 OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj
+5 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-c94d3492/AFNetworking-c94d3492-dummy.m
+8 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-c94d3492/AFNetworking-c94d3492-prefix.pch
+9 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-c94d3492/AFNetworking-c94d3492.xcconfig
+5 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-iOS/AFNetworking-iOS-dummy.m
+8 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-iOS/AFNetworking-iOS-prefix.pch
+9 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-iOS/AFNetworking-iOS.xcconfig
+0 −5 OHHTTPStubs/Pods/Target Support Files/AFNetworking-iOS7.0/AFNetworking-iOS7.0-dummy.m
+0 −15 OHHTTPStubs/Pods/Target Support Files/AFNetworking-iOS7.0/AFNetworking-iOS7.0-prefix.pch
+0 −9 OHHTTPStubs/Pods/Target Support Files/AFNetworking-iOS7.0/AFNetworking-iOS7.0.xcconfig
+0 −5 OHHTTPStubs/Pods/Target Support Files/AFNetworking-iOS8.0/AFNetworking-iOS8.0-dummy.m
+0 −9 OHHTTPStubs/Pods/Target Support Files/AFNetworking-iOS8.0/AFNetworking-iOS8.0.xcconfig
+5 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-tvOS/AFNetworking-tvOS-dummy.m
+8 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-tvOS/AFNetworking-tvOS-prefix.pch
+9 −0 OHHTTPStubs/Pods/Target Support Files/AFNetworking-tvOS/AFNetworking-tvOS.xcconfig
+0 −5 OHHTTPStubs/Pods/Target Support Files/AFNetworking-tvOS9.0/AFNetworking-tvOS9.0-dummy.m
+0 −9 OHHTTPStubs/Pods/Target Support Files/AFNetworking-tvOS9.0/AFNetworking-tvOS9.0.xcconfig
+0 −5 ...chability-Security-Serialization/AFNetworking.root-NSURLSession-Reachability-Security-Serialization-dummy.m
+0 −9 ...hability-Security-Serialization/AFNetworking.root-NSURLSession-Reachability-Security-Serialization.xcconfig
+3 −1 ... Files/Pods-TestingPods-OHHTTPStubs Mac Tests/Pods-TestingPods-OHHTTPStubs Mac Tests-acknowledgements.plist
+5 −4 ... Support Files/Pods-TestingPods-OHHTTPStubs Mac Tests/Pods-TestingPods-OHHTTPStubs Mac Tests.debug.xcconfig
+5 −4 ...upport Files/Pods-TestingPods-OHHTTPStubs Mac Tests/Pods-TestingPods-OHHTTPStubs Mac Tests.release.xcconfig
+3 −1 ...ods-TestingPods-OHHTTPStubs iOS Fmk Tests/Pods-TestingPods-OHHTTPStubs iOS Fmk Tests-acknowledgements.plist
+5 −4 ... Files/Pods-TestingPods-OHHTTPStubs iOS Fmk Tests/Pods-TestingPods-OHHTTPStubs iOS Fmk Tests.debug.xcconfig
+5 −4 ...iles/Pods-TestingPods-OHHTTPStubs iOS Fmk Tests/Pods-TestingPods-OHHTTPStubs iOS Fmk Tests.release.xcconfig
+3 −1 ...ods-TestingPods-OHHTTPStubs iOS Lib Tests/Pods-TestingPods-OHHTTPStubs iOS Lib Tests-acknowledgements.plist
+5 −4 ... Files/Pods-TestingPods-OHHTTPStubs iOS Lib Tests/Pods-TestingPods-OHHTTPStubs iOS Lib Tests.debug.xcconfig
+5 −4 ...iles/Pods-TestingPods-OHHTTPStubs iOS Lib Tests/Pods-TestingPods-OHHTTPStubs iOS Lib Tests.release.xcconfig
+3 −1 ...s-TestingPods-OHHTTPStubs tvOS Fmk Tests/Pods-TestingPods-OHHTTPStubs tvOS Fmk Tests-acknowledgements.plist
+5 −4 ...iles/Pods-TestingPods-OHHTTPStubs tvOS Fmk Tests/Pods-TestingPods-OHHTTPStubs tvOS Fmk Tests.debug.xcconfig
+5 −4 ...es/Pods-TestingPods-OHHTTPStubs tvOS Fmk Tests/Pods-TestingPods-OHHTTPStubs tvOS Fmk Tests.release.xcconfig
+25 −4 OHHTTPStubs/Sources/OHHTTPStubs.m
+10 −0 OHHTTPStubs/Sources/Swift/OHHTTPStubsSwift.swift
+73 −17 OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m
+2 −2 OHHTTPStubs/UnitTests/Test Suites/SwiftHelpersTests.swift
+13 −29 README.md
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 68 files
+4 −2 .hound.yml
+1 −1 .swift-version
+48 −44 .travis.yml
+2 −2 Dangerfile
+1 −1 Documentation/en-us/SharedExamples.md
+1 −1 Documentation/ko-kr/BehavioralTesting.md
+1 −1 Documentation/ko-kr/InstallingQuick.md
+1 −1 Externals/Nimble
+1 −1 Gemfile
+48 −44 Gemfile.lock
+2 −2 Package.resolved
+35 −37 Package.swift
+6 −4 [email protected]
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.h
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Swift/___FILEBASENAME___.swift
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Swift/___FILEBASENAME___.swift
+5 −2 Quick.podspec
+75 −42 Quick.xcodeproj/project.pbxproj
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+8 −0 Quick.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+3 −1 README.md
+9 −6 Rakefile
+1 −1 Sources/Quick/Behavior.swift
+17 −12 Sources/Quick/Callsite.swift
+2 −2 Sources/Quick/Configuration/Configuration.swift
+1 −1 Sources/Quick/Configuration/QuickConfiguration.swift
+10 −10 Sources/Quick/DSL/DSL.swift
+15 −15 Sources/Quick/DSL/World+DSL.swift
+1 −1 Sources/Quick/ErrorUtility.swift
+3 −9 Sources/Quick/Example.swift
+3 −9 Sources/Quick/ExampleMetadata.swift
+3 −9 Sources/Quick/Filter.swift
+2 −2 Sources/Quick/NSBundle+CurrentTestBundle.swift
+2 −2 Sources/Quick/QuickMain.swift
+1 −1 Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+24 −16 Sources/Quick/QuickSpec.swift
+1 −1 Sources/Quick/QuickTestSuite.swift
+4 −7 Sources/Quick/String+C99ExtendedIdentifier.swift
+5 −11 Sources/Quick/World.swift
+1 −1 Sources/QuickObjectiveC/QuickSpec.h
+16 −15 Tests/LinuxMain.swift
+3 −2 Tests/QuickTests/QuickTestHelpers/SpecRunner.swift
+3 −8 Tests/QuickTests/QuickTestHelpers/TestRun.swift
+5 −5 Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BehaviorTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+18 −6 Tests/QuickTests/QuickTests/FunctionalTests/CurrentSpecTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+2 −2 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ObjC/ItTests+ObjC.m
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+8 −23 Tests/QuickTests/QuickTests/Helpers/QCKSpecRunner.m
+24 −0 Tests/QuickTests/QuickTests/Helpers/QuickSpec+MethodList.swift
+0 −17 Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.h
+0 −23 Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.m
+57 −0 Tests/QuickTests/QuickTests/Helpers/QuickSpecRunner.swift
+1 −2 Tests/QuickTests/QuickTests/Helpers/QuickTestsBridgingHeader.h
+0 −20 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.h
+0 −54 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.m
+47 −0 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.swift
+1 −1 script/release
+0 −4 script/travis-install-macos
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
4 changes: 2 additions & 2 deletions Heimdallr.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Heimdallr'
spec.version = '3.6.2'
spec.version = '3.7.0'
spec.authors = {
'trivago' => '[email protected]'
}
Expand All @@ -18,7 +18,7 @@ Pod::Spec.new do |spec|
spec.description = 'Heimdallr is an OAuth 2.0 client specifically designed for easy usage. It currently supports the resource owner password credentials grant flow, refreshing an access token as well as extension grants.'

spec.ios.deployment_target = '9.0'
spec.osx.deployment_target = '10.9'
spec.osx.deployment_target = '10.10'

spec.default_subspec = 'Core'

Expand Down
97 changes: 59 additions & 38 deletions Heimdallr.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,18 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
4589DE79226B996D00A03FFA /* macOS-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = "<group>"; };
4589DE7A226B996D00A03FFA /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = "<group>"; };
4589DE7B226B996D00A03FFA /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
4589DE7C226B996D00A03FFA /* macOS-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = "<group>"; };
4589DE7D226B996D00A03FFA /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = "<group>"; };
4589DE7E226B996D00A03FFA /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
4589DE80226B996D00A03FFA /* Mac-XCTest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-XCTest.xcconfig"; sourceTree = "<group>"; };
4589DE81226B996D00A03FFA /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
4589DE82226B996D00A03FFA /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
4589DE83226B996D00A03FFA /* Mac-Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = "<group>"; };
4589DE84226B996D00A03FFA /* Mac-Application.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
4589DE85226B996D00A03FFA /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
D44F76361DA52BDB002A4AC4 /* ReactiveSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveSwift.framework; path = Carthage/Checkouts/ReactiveSwift/build/Debug/ReactiveSwift.framework; sourceTree = "<group>"; };
D44F76381DA52BEA002A4AC4 /* ReactiveSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveSwift.framework; path = "../../Library/Developer/Xcode/DerivedData/Heimdallr-fdtctotgikuwtugzxtbbivybhrkn/Build/Products/Debug-iphonesimulator/ReactiveSwift.framework"; sourceTree = "<group>"; };
DC209CC51C845F1900C43C75 /* Argo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Argo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -145,11 +157,6 @@
DC712A4B1C85AD77009860A5 /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = "<group>"; };
DC712A4C1C85AD77009860A5 /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = "<group>"; };
DC712A4D1C85AD77009860A5 /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
DC712A4F1C85AD77009860A5 /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
DC712A501C85AD77009860A5 /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = "<group>"; };
DC712A511C85AD77009860A5 /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
DC712A521C85AD77009860A5 /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
DC712A531C85AD77009860A5 /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
DC712A561C85AD77009860A5 /* tvOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Application.xcconfig"; sourceTree = "<group>"; };
DC712A571C85AD77009860A5 /* tvOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Base.xcconfig"; sourceTree = "<group>"; };
DC712A581C85AD77009860A5 /* tvOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "tvOS-Framework.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -204,6 +211,34 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
4589DE78226B996D00A03FFA /* macOS */ = {
isa = PBXGroup;
children = (
4589DE79226B996D00A03FFA /* macOS-Application.xcconfig */,
4589DE7A226B996D00A03FFA /* macOS-Framework.xcconfig */,
4589DE7B226B996D00A03FFA /* macOS-StaticLibrary.xcconfig */,
4589DE7C226B996D00A03FFA /* macOS-Base.xcconfig */,
4589DE7D226B996D00A03FFA /* macOS-XCTest.xcconfig */,
4589DE7E226B996D00A03FFA /* macOS-DynamicLibrary.xcconfig */,
);
name = macOS;
path = Carthage/Checkouts/xcconfigs/macOS;
sourceTree = SOURCE_ROOT;
};
4589DE7F226B996D00A03FFA /* Mac OS X */ = {
isa = PBXGroup;
children = (
4589DE80226B996D00A03FFA /* Mac-XCTest.xcconfig */,
4589DE81226B996D00A03FFA /* Mac-StaticLibrary.xcconfig */,
4589DE82226B996D00A03FFA /* Mac-Framework.xcconfig */,
4589DE83226B996D00A03FFA /* Mac-Base.xcconfig */,
4589DE84226B996D00A03FFA /* Mac-Application.xcconfig */,
4589DE85226B996D00A03FFA /* Mac-DynamicLibrary.xcconfig */,
);
name = "Mac OS X";
path = "Carthage/Checkouts/xcconfigs/Mac OS X";
sourceTree = SOURCE_ROOT;
};
DC209CCC1C845F2000C43C75 /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -314,7 +349,8 @@
children = (
DC712A3E1C85AD77009860A5 /* Base */,
DC712A491C85AD77009860A5 /* iOS */,
DC712A4E1C85AD77009860A5 /* Mac OS X */,
4589DE7F226B996D00A03FFA /* Mac OS X */,
4589DE78226B996D00A03FFA /* macOS */,
DC712A551C85AD77009860A5 /* tvOS */,
DC712A5A1C85AD77009860A5 /* watchOS */,
);
Expand Down Expand Up @@ -364,18 +400,6 @@
path = iOS;
sourceTree = "<group>";
};
DC712A4E1C85AD77009860A5 /* Mac OS X */ = {
isa = PBXGroup;
children = (
DC712A4F1C85AD77009860A5 /* Mac-Application.xcconfig */,
DC712A501C85AD77009860A5 /* Mac-Base.xcconfig */,
DC712A511C85AD77009860A5 /* Mac-DynamicLibrary.xcconfig */,
DC712A521C85AD77009860A5 /* Mac-Framework.xcconfig */,
DC712A531C85AD77009860A5 /* Mac-StaticLibrary.xcconfig */,
);
path = "Mac OS X";
sourceTree = "<group>";
};
DC712A551C85AD77009860A5 /* tvOS */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -506,11 +530,11 @@
TargetAttributes = {
DC545DC11A89F0F10051A575 = {
CreatedOnToolsVersion = 6.1.1;
LastSwiftMigration = 1010;
LastSwiftMigration = 1020;
};
DC545DCC1A89F0F10051A575 = {
CreatedOnToolsVersion = 6.1.1;
LastSwiftMigration = 1010;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
DC582F421BE1319F0017BE06 = {
Expand All @@ -528,6 +552,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = DC545DB81A89F0F10051A575;
Expand Down Expand Up @@ -700,7 +725,7 @@
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = "de.rheinfabrik.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(PROJECT_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -718,7 +743,7 @@
CURRENT_PROJECT_VERSION = 1;
GCC_NO_COMMON_BLOCKS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = "de.rheinfabrik.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(PROJECT_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -738,8 +763,7 @@
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -754,8 +778,7 @@
DYLIB_CURRENT_VERSION = 1;
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -767,8 +790,7 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = HeimdallrTests;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -780,56 +802,55 @@
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = HeimdallrTests;
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
DC582F551BE1319F0017BE06 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC712A521C85AD77009860A5 /* Mac-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
SWIFT_VERSION = 4.2;
MACOSX_DEPLOYMENT_TARGET = 10.10;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
DC582F561BE1319F0017BE06 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC712A521C85AD77009860A5 /* Mac-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = "Heimdallr/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
SWIFT_VERSION = 4.2;
MACOSX_DEPLOYMENT_TARGET = 10.10;
SWIFT_VERSION = 5.0;
};
name = Release;
};
DC582F581BE1319F0017BE06 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC712A4F1C85AD77009860A5 /* Mac-Application.xcconfig */;
buildSettings = {
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = HeimdallrTests;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
DC582F591BE1319F0017BE06 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = DC712A4F1C85AD77009860A5 /* Mac-Application.xcconfig */;
buildSettings = {
INFOPLIST_FILE = "HeimdallrTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = HeimdallrTests;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
1 change: 1 addition & 0 deletions Heimdallr/OAuthAccessToken.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Foundation
import Result

/// An access token is used for authorizing requests to the resource endpoint.
Expand Down
1 change: 1 addition & 0 deletions Heimdallr/OAuthAccessTokenKeychainStore.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Foundation
import Security

internal struct Keychain {
Expand Down
7 changes: 4 additions & 3 deletions Heimdallr/OAuthError.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/// See: The OAuth 2.0 Authorization Framework, 5.2 NSError Response
/// <https://tools.ietf.org/html/rfc6749#section-5.2>
import Foundation

public let OAuthErrorDomain = "OAuthErrorDomain"
public let OAuthErrorInvalidRequest = 1
Expand All @@ -21,7 +22,7 @@ public enum OAuthErrorCode: String {
}

public extension OAuthErrorCode {
public var intValue: Int {
var intValue: Int {
switch self {
case .InvalidRequest:
return OAuthErrorInvalidRequest
Expand Down Expand Up @@ -60,7 +61,7 @@ public class OAuthError {
}

public extension OAuthError {
public var nsError: NSError {
var nsError: NSError {
var userInfo = [String: AnyObject]()

if let description = description {
Expand Down Expand Up @@ -88,7 +89,7 @@ extension OAuthError {
}

public class func decode(data: Data) -> OAuthError? {
guard let json: AnyObject? = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions(rawValue: 0)) as AnyObject?,
guard let json: AnyObject? = ((try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions(rawValue: 0)) as AnyObject?) as AnyObject??),
let jsonDictionary = json as? [String: AnyObject] else {
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion Heimdallr/Supporting Files/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.6.1</string>
<string>3.7.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
8 changes: 4 additions & 4 deletions Heimdallr/URLRequestExtensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ private let HTTPRequestHeaderFieldAuthorization = "Authorization"

public extension URLRequest {
/// Returns the HTTP `Authorization` header value or `nil` if not set.
public var HTTPAuthorization: String? {
var HTTPAuthorization: String? {
return value(forHTTPHeaderField: HTTPRequestHeaderFieldAuthorization)
}

Expand All @@ -57,15 +57,15 @@ public extension URLRequest {
/// - parameter value: The value to be set or `nil`.
///
/// TODO: Declarations in extensions cannot override yet.
public mutating func setHTTPAuthorization(_ value: String?) {
mutating func setHTTPAuthorization(_ value: String?) {
setValue(value, forHTTPHeaderField: HTTPRequestHeaderFieldAuthorization)
}

/// Sets the HTTP `Authorization` header value using the given HTTP
/// authentication.
///
/// - parameter authentication: The HTTP authentication to be set.
public mutating func setHTTPAuthorization(_ authentication: HTTPAuthentication) {
mutating func setHTTPAuthorization(_ authentication: HTTPAuthentication) {
setHTTPAuthorization(authentication.value)
}

Expand All @@ -74,7 +74,7 @@ public extension URLRequest {
/// - parameter parameters: The parameters to be encoded or `nil`.
///
/// TODO: Tests crash without named parameter.
public mutating func setHTTPBody(parameters: [String: AnyObject]?) {
mutating func setHTTPBody(parameters: [String: AnyObject]?) {
if let parameters = parameters {
var components: [(String, String)] = []
for (key, value) in parameters {
Expand Down

0 comments on commit 70d3d00

Please sign in to comment.