Skip to content

Commit

Permalink
Merge pull request #49 from RomanPodymov/feature/promisekit_8
Browse files Browse the repository at this point in the history
PromiseKit 8
  • Loading branch information
mxcl authored Feb 8, 2024
2 parents e1791b8 + 7f8eab0 commit cd2c1b1
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "mxcl/PromiseKit" ~> 6.13.0
github "Alamofire/Alamofire" ~> 5.2.1
github "mxcl/PromiseKit" ~> 8.1.1
github "Alamofire/Alamofire" ~> 5.8.1
2 changes: 1 addition & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "AliSoftware/OHHTTPStubs" ~> 8.0.0
github "AliSoftware/OHHTTPStubs" ~> 9.1.0
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Alamofire/Alamofire" "5.2.1"
github "AliSoftware/OHHTTPStubs" "8.0.0"
github "mxcl/PromiseKit" "6.13.1"
github "Alamofire/Alamofire" "5.8.1"
github "AliSoftware/OHHTTPStubs" "9.1.0"
github "mxcl/PromiseKit" "8.1.1"
25 changes: 25 additions & 0 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"object": {
"pins": [
{
"package": "Alamofire",
"repositoryURL": "https://github.com/Alamofire/Alamofire.git",
"state": {
"branch": null,
"revision": "3dc6a42c7727c49bf26508e29b0a0b35f9c7e1ad",
"version": "5.8.1"
}
},
{
"package": "PromiseKit",
"repositoryURL": "https://github.com/mxcl/PromiseKit.git",
"state": {
"branch": null,
"revision": "cb70b070cde06837cd10a1febdf6105c1a3bb348",
"version": "8.1.1"
}
}
]
},
"version": 1
}
6 changes: 3 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ let package = Package(
.library(name: "PMKAlamofire", targets: ["PMKAlamofire"])
],
dependencies: [
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.13.2"),
.package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.2.2")
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "8.1.1"),
.package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.8.1")
],
targets: [
.target(name: "PMKAlamofire", dependencies: [
.product(name: "PromiseKit"),
.product(name: "Alamofire"),
], path: "Sources")
],
swiftLanguageVersions: [.v5])
swiftLanguageVersions: [.v5])

0 comments on commit cd2c1b1

Please sign in to comment.