Skip to content

Commit ddc80ff

Browse files
ossus-libossus-lib
authored
Merge pull request p2#302 from djbe/release/4.2.0
Release 4.2.0
2 parents 43b54c5 + 77641bc commit ddc80ff

File tree

5 files changed

+157
-21
lines changed

5 files changed

+157
-21
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Changelog
44
Version numbering represents the Swift version, plus a running number representing updates, fixes and new features at the same time.
55
You can also refer to commit logs to get details on what was implemented, fixed and improved.
66

7-
### Master
7+
### 4.2.0
88

99
- Swift 4.2 support.
1010
[djbe](https://github.com/djbe)

‎Gemfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# frozen_string_literal: true
2+
3+
source 'https://rubygems.org'
4+
5+
# The bare minimum for building, e.g. in Homebrew
6+
group :build do
7+
end
8+
9+
# In addition to :build, for contributing
10+
group :development do
11+
end
12+
13+
# For releasing to GitHub
14+
group :release do
15+
gem 'cocoapods', '~> 1.6.0.beta.2'
16+
gem 'jazzy'
17+
end

‎Gemfile.lock‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.0)
5+
activesupport (4.2.11)
6+
i18n (~> 0.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
atomos (0.1.3)
11+
claide (1.0.2)
12+
cocoapods (1.6.0.beta.2)
13+
activesupport (>= 4.0.2, < 5)
14+
claide (>= 1.0.2, < 2.0)
15+
cocoapods-core (= 1.6.0.beta.2)
16+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17+
cocoapods-downloader (>= 1.2.2, < 2.0)
18+
cocoapods-plugins (>= 1.0.0, < 2.0)
19+
cocoapods-search (>= 1.0.0, < 2.0)
20+
cocoapods-stats (>= 1.0.0, < 2.0)
21+
cocoapods-trunk (>= 1.3.1, < 2.0)
22+
cocoapods-try (>= 1.1.0, < 2.0)
23+
colored2 (~> 3.1)
24+
escape (~> 0.0.4)
25+
fourflusher (~> 2.0.1)
26+
gh_inspector (~> 1.0)
27+
molinillo (~> 0.6.6)
28+
nap (~> 1.0)
29+
ruby-macho (~> 1.3, >= 1.3.1)
30+
xcodeproj (>= 1.7.0, < 2.0)
31+
cocoapods-core (1.6.0.beta.2)
32+
activesupport (>= 4.0.2, < 6)
33+
fuzzy_match (~> 2.0.4)
34+
nap (~> 1.0)
35+
cocoapods-deintegrate (1.0.2)
36+
cocoapods-downloader (1.2.2)
37+
cocoapods-plugins (1.0.0)
38+
nap
39+
cocoapods-search (1.0.0)
40+
cocoapods-stats (1.0.0)
41+
cocoapods-trunk (1.3.1)
42+
nap (>= 0.8, < 2.0)
43+
netrc (~> 0.11)
44+
cocoapods-try (1.1.0)
45+
colored2 (3.1.2)
46+
concurrent-ruby (1.1.4)
47+
escape (0.0.4)
48+
ffi (1.10.0)
49+
fourflusher (2.0.1)
50+
fuzzy_match (2.0.4)
51+
gh_inspector (1.1.3)
52+
i18n (0.9.5)
53+
concurrent-ruby (~> 1.0)
54+
jazzy (0.9.4)
55+
cocoapods (~> 1.0)
56+
mustache (~> 0.99)
57+
open4
58+
redcarpet (~> 3.2)
59+
rouge (>= 2.0.6, < 4.0)
60+
sass (~> 3.4)
61+
sqlite3 (~> 1.3)
62+
xcinvoke (~> 0.3.0)
63+
liferaft (0.0.6)
64+
minitest (5.11.3)
65+
molinillo (0.6.6)
66+
mustache (0.99.8)
67+
nanaimo (0.2.6)
68+
nap (1.1.0)
69+
netrc (0.11.0)
70+
open4 (1.3.4)
71+
rb-fsevent (0.10.3)
72+
rb-inotify (0.10.0)
73+
ffi (~> 1.0)
74+
redcarpet (3.4.0)
75+
rouge (3.3.0)
76+
ruby-macho (1.3.1)
77+
sass (3.7.3)
78+
sass-listen (~> 4.0.0)
79+
sass-listen (4.0.0)
80+
rb-fsevent (~> 0.9, >= 0.9.4)
81+
rb-inotify (~> 0.9, >= 0.9.7)
82+
sqlite3 (1.3.13)
83+
thread_safe (0.3.6)
84+
tzinfo (1.2.5)
85+
thread_safe (~> 0.1)
86+
xcinvoke (0.3.0)
87+
liferaft (~> 0.0.6)
88+
xcodeproj (1.7.0)
89+
CFPropertyList (>= 2.3.3, < 4.0)
90+
atomos (~> 0.1.3)
91+
claide (>= 1.0.2, < 2.0)
92+
colored2 (~> 3.1)
93+
nanaimo (~> 0.2.6)
94+
95+
PLATFORMS
96+
ruby
97+
98+
DEPENDENCIES
99+
cocoapods (~> 1.6.0.beta.2)
100+
jazzy
101+
102+
BUNDLED WITH
103+
1.17.1

‎generate-docs.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/bash
22
#
33
# Build documentation using jazzy:
4-
# [sudo] gem install jazzy
4+
# [sudo] bundle install
55

6-
jazzy \
6+
bundle exec jazzy \
77
-o "docs" \
88
--min-acl "internal" \
9-
--module-version "3.0.3"
9+
--module-version "4.2.0"
1010

1111
mkdir docs/assets 2>/dev/null
1212
cp assets/* docs/assets/

‎p2.OAuth2.podspec‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#
77

88
Pod::Spec.new do |s|
9-
s.name = "p2.OAuth2"
10-
s.version = "4.0.1"
11-
s.summary = "OAuth2 framework for macOS, iOS and tvOS, written in Swift."
9+
s.name = 'p2.OAuth2'
10+
s.version = '4.2.0'
11+
s.summary = 'OAuth2 framework for macOS, iOS and tvOS, written in Swift.'
1212
s.description = <<-DESC
1313
OAuth2 frameworks for macOS, iOS and tvOS written in Swift.
1414
@@ -19,21 +19,37 @@ Pod::Spec.new do |s|
1919
Start with `import p2_OAuth2` in your source files. Code documentation is available from within
2020
Xcode (ALT + click on symbols) and on [p2.github.io/OAuth2/](http://p2.github.io/OAuth2/).
2121
DESC
22-
s.homepage = "https://github.com/p2/OAuth2"
23-
s.documentation_url = "http://p2.github.io/OAuth2/"
24-
s.license = "Apache 2"
25-
s.author = { "Pascal Pfiffner" => "[email protected]" }
26-
s.source = { :git => "https://github.com/p2/OAuth2.git", :tag => "#{s.version}", :submodules => true }
22+
s.homepage = 'https://github.com/p2/OAuth2'
23+
s.documentation_url = 'http://p2.github.io/OAuth2/'
24+
s.license = 'Apache 2'
25+
s.author = {
26+
'Pascal Pfiffner' => '[email protected]'
27+
}
2728

28-
s.ios.deployment_target = "8.0"
29-
s.osx.deployment_target = "10.10"
30-
s.tvos.deployment_target = "9.0"
31-
s.pod_target_xcconfig = { "OTHER_SWIFT_FLAGS" => "-DNO_MODULE_IMPORT -DNO_KEYCHAIN_IMPORT" }
29+
s.source = {
30+
:git => 'https://github.com/p2/OAuth2.git',
31+
:tag => s.version.to_s,
32+
:submodules => true
33+
}
34+
s.swift_version = '4.2'
35+
s.cocoapods_version = '>= 1.4.0'
3236

33-
s.source_files = "SwiftKeychain/Keychain/*.swift", "Sources/Base/*.swift", "Sources/Flows/*.swift", "Sources/DataLoader/*.swift"
34-
s.ios.source_files = "Sources/iOS/*.swift"
35-
s.osx.source_files = "Sources/macOS/*.swift"
36-
s.tvos.source_files = "Sources/tvOS/*.swift"
37+
s.ios.deployment_target = '8.0'
38+
s.osx.deployment_target = '10.10'
39+
s.tvos.deployment_target = '9.0'
40+
s.pod_target_xcconfig = {
41+
'OTHER_SWIFT_FLAGS' => '-DNO_MODULE_IMPORT -DNO_KEYCHAIN_IMPORT'
42+
}
3743

38-
s.ios.framework = "SafariServices"
44+
s.source_files = [
45+
'SwiftKeychain/Keychain/*.swift',
46+
'Sources/Base/*.swift',
47+
'Sources/Flows/*.swift',
48+
'Sources/DataLoader/*.swift'
49+
]
50+
s.ios.source_files = 'Sources/iOS/*.swift'
51+
s.osx.source_files = 'Sources/macOS/*.swift'
52+
s.tvos.source_files = 'Sources/tvOS/*.swift'
53+
54+
s.ios.framework = 'SafariServices'
3955
end

0 commit comments

Comments
 (0)