forked from trivago/Heimdallr.swift
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request trivago#122 from fbeeper/feature/swift5
Update project to Swift 5 and Update Dependencies
- Loading branch information
Showing
16 changed files
with
97 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
# Core | ||
github "antitypical/Result" ~> 3.2 | ||
github "antitypical/Result" ~> 4.1.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
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" | ||
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" "1.0" |
Submodule OHHTTPStubs
updated
95 files
Submodule Quick
updated
99 files
Submodule Result
updated
23 files
Submodule xcconfigs
updated
from 40f9bc to d0f899
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.1' | ||
spec.version = '3.7.0' | ||
spec.authors = { | ||
'trivago' => '[email protected]' | ||
} | ||
|
@@ -18,14 +18,14 @@ 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' | ||
|
||
spec.subspec 'Core' do |subspec| | ||
subspec.dependency 'Result', '~> 3.0' | ||
subspec.dependency 'Result', '~> 4.1.0' | ||
subspec.framework = 'Foundation' | ||
|
||
subspec.source_files = 'Heimdallr/Core/*.swift' | ||
subspec.source_files = 'Heimdallr/*.swift' | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
<plist version="1.0"> | ||
<dict> | ||
<key>IDEDidComputeMac32BitWarning</key> | ||
<true/> | ||
</dict> | ||
</plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
import Foundation | ||
import Security | ||
|
||
internal struct Keychain { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters