Skip to content
This repository has been archived by the owner on Nov 8, 2021. It is now read-only.

Commit

Permalink
Merge pull request #16 from Otbivnoe/update-alamofire-v5.1
Browse files Browse the repository at this point in the history
Update the version of Alamofire -> 5.1.0
  • Loading branch information
Otbivnoe authored Apr 21, 2020
2 parents 25fb5ea + ca91044 commit a4313aa
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 16 deletions.
18 changes: 10 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,38 @@
osx_image: xcode10.2
osx_image: xcode11.3
language: generic
os: osx
xcode_project: CodableAlamofire.xcodeproj
matrix:
include:
- osx_image:
os: linux
env: TEST=Unix swift=5.0
env: TEST=Unix swift=5.1

- xcode_scheme: CodableAlamofire-macOS
language: objective-c
env:
- XCODE_SDK=macosx10.14
- XCODE_SDK=macosx10.15
- XCODE_ACTION="test"
- XCODE_DESTINATION="arch=x86_64"

- xcode_scheme: CodableAlamofire-iOS
language: objective-c
env:
- XCODE_SDK=iphonesimulator12.2
- XCODE_SDK=iphonesimulator13.2
- XCODE_ACTION="test"
- XCODE_DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone 6"
- XCODE_DESTINATION="platform=iOS Simulator,OS=13.1,name=iPhone 8"

- xcode_scheme: CodableAlamofire-tvOS
language: objective-c
env:
- XCODE_SDK=appletvsimulator12.2
- XCODE_SDK=appletvsimulator13.2
- XCODE_ACTION="test"
- XCODE_DESTINATION="platform=tvOS Simulator,OS=12.2,name=Apple TV"
- XCODE_DESTINATION="platform=tvOS Simulator,OS=13.2,name=Apple TV"

- xcode_scheme: CodableAlamofire-watchOS
language: objective-c
env:
- XCODE_SDK=watchsimulator5.2
- XCODE_SDK=watchsimulator6.1
- XCODE_ACTION="build"
- XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch - 38mm"
install:
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Alamofire/Alamofire" "5.0.0-rc.3"
github "Alamofire/Alamofire" ~> 5.1.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Alamofire/Alamofire" "5.0.0-rc.3"
github "Alamofire/Alamofire" "5.1.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Alamofire
Submodule Alamofire updated 357 files
4 changes: 2 additions & 2 deletions CodableAlamofire.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Pod::Spec.new do |s|

s.name = "CodableAlamofire"
s.version = "1.2.0"
s.version = "1.2.1"
s.summary = "An extension for Alamofire that converts JSON data into Decodable Objects."
s.homepage = "https://github.com/Otbivnoe/CodableAlamofire"
s.license = { :type => "MIT", :file => "LICENSE" }
Expand All @@ -26,6 +26,6 @@ Pod::Spec.new do |s|
s.swift_versions = ['4.0', '5.0', '5.1']

s.requires_arc = true
s.dependency 'Alamofire', '~> 5.0.0-rc.3'
s.dependency 'Alamofire', '~> 5.1.0'

end
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/Alamofire/Alamofire",
"state": {
"branch": null,
"revision": "2cbf59935fbb1f26e352ce4db53f1cf9408d5313",
"version": "5.0.0-rc.3"
"revision": "fca036f7aeca07124067cb6e0c12b0ad6359e3d4",
"version": "5.1.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let package = Package(
.library(name: "CodableAlamofire", targets: ["CodableAlamofire"]),
],
dependencies: [
.package(url: "https://github.com/Alamofire/Alamofire", from: "5.0.0-rc.3")
.package(url: "https://github.com/Alamofire/Alamofire", from: "5.1.0")
],
targets: [
.target(
Expand Down

0 comments on commit a4313aa

Please sign in to comment.