Skip to content

Commit

Permalink
Merge commit '0efd11a669aba0f7c8ed2946e93757bb3dfdd6a6'
Browse files Browse the repository at this point in the history
* commit '0efd11a669aba0f7c8ed2946e93757bb3dfdd6a6':
  Update Travis config
  Update project settings and CHANGELOG
  Improve documentation
  Fix compilation errors and warnings from PKCE merge
  Add refresh uri setting (p2#330)
  Mac Catalyst support (p2#328)
  Changed autorizeContext var to weak (p2#329)
  Add PKCE support (p2#324)
  Update Swift package manager configuration (p2#322)
  Update to Swift 5
  Fix compile errors with Swift 5 (p2#313)
  Update README.md
  Add support for Authentication Session (p2#305)
  Update version in sample configurations of the README to 4.2
  Use bundler for generating docs
  Set podspec version to 4.2.0
  Add compiler flag to disable UIApplication calls (p2#280)
  • Loading branch information
ajandrade committed Oct 14, 2020
2 parents ea7121d + 0efd11a commit bf19760
Show file tree
Hide file tree
Showing 31 changed files with 647 additions and 189 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5.1
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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>
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c # well "swift" actually
osx_image: xcode9
language: swift
osx_image: xcode11.3
xcode_project: OAuth2.xcodeproj
xcode_scheme: OAuth2macOS
xcode_sdk: macosx
Expand Down
27 changes: 26 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,32 @@ Changelog
Version numbering represents the Swift version, plus a running number representing updates, fixes and new features at the same time.
You can also refer to commit logs to get details on what was implemented, fixed and improved.

### Master
### 5.2.0

- Separate setting for `refresh_uri`.
[fotiDim](https://github.com/fotiDim)
[#330](https://github.com/p2/OAuth2/pull/330)
- Add Mac Catalyst support.
[telipskiy](https://github.com/telipskiy)
[#328](https://github.com/p2/OAuth2/pull/328)
- Add PKCE support.
[larrybrunet](https://github.com/larrybrunet)
[#324](https://github.com/p2/OAuth2/pull/324)

### 5.1.0

- Update Swift package configuration for use with XCode 11.

### 5.0.0

- Swift 5.0 support.
[drdavec](https://github.com/drdavec)
[#313](https://github.com/p2/OAuth2/pull/313)
- Add support for Authentication Session.
[blork](https://github.com/blork)
[#305](https://github.com/p2/OAuth2/pull/305)

### 4.2.0

- Swift 4.2 support.
[djbe](https://github.com/djbe)
Expand Down
6 changes: 6 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@ Contributors

Contributors to the codebase, in reverse chronological order:

- Foti Dim, @fotidim
- Denis, @telipskiy
- Larry Brunet, @larrybrunet
- Dave Carlson, @drdavec
- Sam Oakley, @blork
- David Jennes, @davidjennes
- Tim Schmitz, @tschmitz
- Maxime Le Moine, @MaximeLM
- Seb Skuse, @sebskuse
- David Hardiman, @dhardiman
- Amaury David, @amaurydavid
Expand Down
17 changes: 17 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# frozen_string_literal: true

source 'https://rubygems.org'

# The bare minimum for building, e.g. in Homebrew
group :build do
end

# In addition to :build, for contributing
group :development do
end

# For releasing to GitHub
group :release do
gem 'cocoapods', '~> 1.6.0.beta.2'
gem 'jazzy'
end
103 changes: 103 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
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)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.6.0.beta.2)
activesupport (>= 4.0.2, < 5)
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-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-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
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)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.2)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.3.1)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored2 (3.1.2)
concurrent-ruby (1.1.4)
escape (0.0.4)
ffi (1.10.0)
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
i18n (0.9.5)
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)
sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0)
liferaft (0.0.6)
minitest (5.11.3)
molinillo (0.6.6)
mustache (0.99.8)
nanaimo (0.2.6)
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.4.0)
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)
xcinvoke (0.3.0)
liferaft (~> 0.0.6)
xcodeproj (1.7.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)

PLATFORMS
ruby

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

BUNDLED WITH
1.17.1
2 changes: 1 addition & 1 deletion Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.3</string>
<string>5.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Loading

0 comments on commit bf19760

Please sign in to comment.