Skip to content
This repository has been archived by the owner on May 10, 2023. It is now read-only.

Commit

Permalink
Update Alamofire
Browse files Browse the repository at this point in the history
  • Loading branch information
@rahul0x24
rahul0x24 committed Dec 11, 2018
1 parent d9cfd35 commit 9c4f48e
Show file tree
Hide file tree
Showing 47 changed files with 437 additions and 726 deletions.
23 changes: 11 additions & 12 deletions .travis.yml
View file
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode9.2
osx_image: xcode10
branches:
only:
- master
Expand Down Expand Up @@ -27,17 +27,16 @@ env:
- TVOS_FRAMEWORK_SCHEME="Restofire-tvOS"
- WATCHOS_FRAMEWORK_SCHEME="Restofire-watchOS"
matrix:
- DESTINATION="OS=11.2,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" PLATFORM="iOS"
- DESTINATION="OS=10.3.1,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" PLATFORM="iOS"
- DESTINATION="OS=9.0,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" PLATFORM="iOS"
- DESTINATION="OS=8.1,name=iPhone 5s" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" PLATFORM="iOS"
- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" RUN_TESTS="YES" PLATFORM="macOS"
- DESTINATION="OS=11.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" PLATFORM="tvOS"
- DESTINATION="OS=10.2,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" PLATFORM="tvOS"
- DESTINATION="OS=9.0,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES" PLATFORM="tvOS"
- DESTINATION="OS=4.0,name=Apple Watch Series 2 - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" PLATFORM="watchOS"
- DESTINATION="OS=3.1,name=Apple Watch Series 2 - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" PLATFORM="watchOS"
- DESTINATION="OS=2.0,name=Apple Watch - 38mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" PLATFORM="watchOS"
- DESTINATION="OS=12.0,name=iPhone XS" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"
- DESTINATION="OS=11.4,name=iPhone X" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"
- DESTINATION="OS=10.3.1,name=iPhone 7 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"
- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" RUN_TESTS="YES"
- DESTINATION="OS=12.0,name=Apple TV 4K (at 1080p)" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"
- DESTINATION="OS=11.4,name=Apple TV 4K (at 1080p)" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"
- DESTINATION="OS=10.2,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"
- DESTINATION="OS=5.0,name=Apple Watch Series 4 - 44mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO"
- DESTINATION="OS=4.2,name=Apple Watch Series 3 - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO"
- DESTINATION="OS=3.1,name=Apple Watch Series 2 - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" RUN_TESTS="NO"

before_script:
- sh scripts/bootstrap
Expand Down
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
@@ -1,3 +1,3 @@
github "Alamofire/Alamofire" "d927d24f38f5b4bf3ae10fa8db4df2c5a2ef4ff2"
github "Quick/Nimble" "v7.1.3"
github "Alamofire/Alamofire" "a8a2827f5c14c9168a0373e948e963d36edfdbc5"
github "Quick/Nimble" "v7.3.0"
github "Quick/Quick" "v1.3.1"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Alamofire
Submodule Alamofire updated 22 files
+1 −1 .ruby-version
+7 −8 .travis.yml
+22 −22 Alamofire.xcodeproj/project.pbxproj
+8 −1 Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire iOS.xcscheme
+9 −1 Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire macOS.xcscheme
+8 −1 Alamofire.xcodeproj/xcshareddata/xcschemes/Alamofire tvOS.xcscheme
+5 −5 Example/Source/MasterViewController.swift
+14 −14 Source/Alamofire.swift
+1 −1 Source/HTTPHeaders.swift
+1 −1 Source/RequestRetrier.swift
+161 −19 Source/Session.swift
+29 −147 Source/SessionStateProvider.swift
+2 −2 Tests/AuthenticationTests.swift
+7 −7 Tests/CacheTests.swift
+36 −36 Tests/MultipartFormDataTests.swift
+12 −13 Tests/RequestTests.swift
+2 −2 Tests/SessionDelegateTests.swift
+38 −50 Tests/SessionManagerTests.swift
+16 −16 Tests/TLSEvaluationTests.swift
+2 −2 Tests/URLProtocolTests.swift
+2 −2 Tests/UploadTests.swift
+9 −8 Tests/ValidationTests.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 40 files
+1 −1 Nimble.podspec
+24 −24 Nimble.xcodeproj/project.pbxproj
+2 −2 Sources/Nimble/Adapters/AssertionRecorder.swift
+1 −1 Sources/Nimble/Adapters/NMBExpectation.swift
+21 −11 Sources/Nimble/Adapters/NMBObjCMatcher.swift
+1 −1 Sources/Nimble/Adapters/NimbleXCTestHandler.swift
+14 −21 Sources/Nimble/Expectation.swift
+3 −1 Sources/Nimble/ExpectationMessage.swift
+3 −3 Sources/Nimble/Matchers/AllPass.swift
+19 −80 Sources/Nimble/Matchers/Async.swift
+1 −1 Sources/Nimble/Matchers/BeAKindOf.swift
+1 −1 Sources/Nimble/Matchers/BeAnInstanceOf.swift
+14 −2 Sources/Nimble/Matchers/BeCloseTo.swift
+3 −3 Sources/Nimble/Matchers/BeEmpty.swift
+1 −1 Sources/Nimble/Matchers/BeGreaterThan.swift
+10 −10 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+1 −1 Sources/Nimble/Matchers/BeIdenticalTo.swift
+10 −10 Sources/Nimble/Matchers/BeLessThan.swift
+9 −10 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+4 −4 Sources/Nimble/Matchers/BeLogical.swift
+1 −1 Sources/Nimble/Matchers/BeNil.swift
+3 −3 Sources/Nimble/Matchers/BeginWith.swift
+24 −24 Sources/Nimble/Matchers/Contain.swift
+10 −12 Sources/Nimble/Matchers/ContainElementSatisfying.swift
+17 −21 Sources/Nimble/Matchers/EndWith.swift
+1 −1 Sources/Nimble/Matchers/Equal.swift
+23 −17 Sources/Nimble/Matchers/HaveCount.swift
+1 −1 Sources/Nimble/Matchers/Match.swift
+32 −14 Sources/Nimble/Matchers/MatchError.swift
+4 −2 Sources/Nimble/Matchers/PostNotification.swift
+7 −3 Sources/Nimble/Matchers/Predicate.swift
+16 −10 Sources/Nimble/Matchers/RaisesException.swift
+6 −31 Sources/Nimble/Matchers/SatisfyAllOf.swift
+6 −31 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+12 −16 Sources/Nimble/Matchers/ThrowAssertion.swift
+45 −39 Sources/Nimble/Matchers/ThrowError.swift
+0 −0 Sources/Nimble/Utils/Await.swift
+6 −6 Tests/NimbleTests/Helpers/utils.swift
+7 −1 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+33 −0 Tests/NimbleTests/SynchronousTest.swift
4 changes: 1 addition & 3 deletions Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0920"
LastUpgradeVersion = "0940"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,7 +26,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -46,7 +45,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
10 changes: 5 additions & 5 deletions Example/Sources/RestofireResponseSerializers.swift
View file
Expand Up @@ -12,11 +12,11 @@ import Alamofire
// MARK:- Decodable Response Serializer
extension Restofire.ResponseSerializable where Response: Decodable {

public var responseSerializer: AnyResponseSerializer<Response> {
return AnyResponseSerializer<Response>.init(
dataSerializer: { (request, response, data, error) -> Response in
return try! JSONDecodableResponseSerializer<Response>()
.serialize(request: request, response: response, data: data, error: error)
public var responseSerializer: AnyResponseSerializer<Result<Response>> {
return AnyResponseSerializer<Result<Response>>.init(
dataSerializer: { (request, response, data, error) -> Result<Response> in
return Result { try JSONDecodableResponseSerializer<Response>()
.serialize(request: request, response: response, data: data, error: error) }
}
)
}
Expand Down

0 comments on commit 9c4f48e

Please sign in to comment.