Skip to content

Commit

Permalink
Merge upstream p2/OAuth2 v5.3.5 code into slidoapp/oauth2-swift m…
Browse files Browse the repository at this point in the history
…ain branch

* upstream/main:
  Fix visionOS build, bump to 5.3.5
  Update version info
  Implement device grant flow (#416)
  fixed issue with wrong state-machine after pull down gesture on presented SFSafariViewController (#415)
  Implement optional custom User-Agent string for embedded MacOS mode (#395)
  Update project files for Swift 5.3 (#413)
  Bring ASWebAuthenticationSession to macOS
  Add deprecation notices for embedded auth. Bump to 5.3.3
  Project Maintenance
  Fix memory issue when dismissing Safari View Controller (#380)
  Update the Alamofire link to the recent version (#382)
  Update OAuth2Authorizer+iOS.swift (#402)
  Add visionOS support
  • Loading branch information
jozefizso committed Oct 21, 2024
2 parents 6fae68d + 3f6a18b commit bd382af
Show file tree
Hide file tree
Showing 22 changed files with 309 additions and 139 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.2
5.3
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,26 @@ You can also refer to commit logs to get details on what was implemented, fixed
#### 5.4.0-slido
- Add the device authorization grant flow [PS-17876](https://sli-do.atlassian.net/browse/PS-17876)

#### 5.3.5

- Fix visionOS build issue
[#417](https://github.com/p2/OAuth2/pull/417)

#### 5.3.4

- Support OAuth2 Device Grant via `OAuth2DeviceGrant`
[DominikPalo](https://github.com/DominikPalo)
[#416](https://github.com/p2/OAuth2/pull/416)
- Fixed issue with wrong states on dismiss via pull down gesture.
[cbruns1985](https://github.com/cbruns1985)
[#415](https://github.com/p2/OAuth2/pull/415)

#### 5.3.3

- Make ASWebAuthenticationSession work on macOS
- Minor maintenance
- Add deprecation notices to using the custom web view controller on iOS, which will be removed in v 6.

#### 5.3.2

- Fix tvOS build.
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Contributors
Contributors to the codebase, in reverse chronological order:

- Dominik Paľo, @DominikPalo
- Greg Price, @ObscureBug
- Joseph Quigley, @josephquigley
- Martin Pittenauer, @m4p
- Lars, @longinius
- Christian Gossain, @cgossain
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ end

# For releasing to GitHub
group :release do
gem 'cocoapods', '~> 1.6.0.beta.2'
gem 'cocoapods'
gem 'jazzy'
end
157 changes: 96 additions & 61 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,103 +1,138 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.0)
activesupport (4.2.11)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
CFPropertyList (3.0.6)
rexml
activesupport (7.1.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.6.0.beta.2)
activesupport (>= 4.0.2, < 5)
base64 (0.2.0)
bigdecimal (3.1.6)
claide (1.1.0)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.6.0.beta.2)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.3.1, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (~> 1.3, >= 1.3.1)
xcodeproj (>= 1.7.0, < 2.0)
cocoapods-core (1.6.0.beta.2)
activesupport (>= 4.0.2, < 6)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.2)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.3.1)
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.1.4)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
drb (2.2.0)
ruby2_keywords
escape (0.0.4)
ffi (1.10.0)
fourflusher (2.0.1)
ethon (0.16.0)
ffi (>= 1.15.0)
ffi (1.16.3)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
httpclient (2.8.3)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jazzy (0.9.4)
cocoapods (~> 1.0)
mustache (~> 0.99)
open4
redcarpet (~> 3.2)
rouge (>= 2.0.6, < 4.0)
sass (~> 3.4)
jazzy (0.14.4)
cocoapods (~> 1.5)
mustache (~> 1.1)
open4 (~> 1.3)
redcarpet (~> 3.4)
rexml (~> 3.2)
rouge (>= 2.0.6, < 5.0)
sassc (~> 2.1)
sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0)
json (2.7.1)
liferaft (0.0.6)
minitest (5.11.3)
molinillo (0.6.6)
mustache (0.99.8)
nanaimo (0.2.6)
minitest (5.22.2)
molinillo (0.8.0)
mustache (1.1.1)
mutex_m (0.2.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
open4 (1.3.4)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
redcarpet (3.5.1)
rouge (3.3.0)
ruby-macho (1.3.1)
sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sqlite3 (1.3.13)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
public_suffix (4.0.7)
redcarpet (3.6.0)
rexml (3.2.6)
rouge (4.2.0)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sqlite3 (1.7.2-aarch64-linux)
sqlite3 (1.7.2-arm-linux)
sqlite3 (1.7.2-arm64-darwin)
sqlite3 (1.7.2-x86-linux)
sqlite3 (1.7.2-x86_64-darwin)
sqlite3 (1.7.2-x86_64-linux)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.7.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)

PLATFORMS
ruby
aarch64-linux
arm-linux
arm64-darwin
x86-linux
x86_64-darwin
x86_64-linux

DEPENDENCIES
cocoapods (~> 1.6.0.beta.2)
cocoapods
jazzy

BUNDLED WITH
1.17.1
2.5.5
Loading

0 comments on commit bd382af

Please sign in to comment.