Skip to content

Commit 9084b33

Browse files
authored
Fix CI (#89)
1 parent 535999a commit 9084b33

File tree

5 files changed

+225
-207
lines changed

5 files changed

+225
-207
lines changed

.github/workflows/ios_main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424

2525
- uses: maxim-lobanov/setup-xcode@v1
2626
with:
27-
xcode-version: "15.4"
27+
xcode-version: "16.2"
2828

2929
- name: install pods
3030
run: pod install
3131

3232
# https://stackoverflow.com/a/57758679/198996
3333
- name: install bundler
34-
run: gem install bundler:1.17.3
34+
run: gem install bundler
3535
- name: install fastlane
3636
run: bundle install
3737

Gemfile.lock

Lines changed: 112 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,57 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.4)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
addressable (2.8.0)
7-
public_suffix (>= 2.0.2, < 5.0)
8-
artifactory (3.0.15)
8+
addressable (2.8.7)
9+
public_suffix (>= 2.0.2, < 7.0)
10+
artifactory (3.0.17)
911
atomos (0.1.3)
10-
aws-eventstream (1.2.0)
11-
aws-partitions (1.521.0)
12-
aws-sdk-core (3.121.5)
13-
aws-eventstream (~> 1, >= 1.0.2)
14-
aws-partitions (~> 1, >= 1.520.1)
15-
aws-sigv4 (~> 1.1)
16-
jmespath (~> 1.0)
17-
aws-sdk-kms (1.50.0)
18-
aws-sdk-core (~> 3, >= 3.121.2)
19-
aws-sigv4 (~> 1.1)
20-
aws-sdk-s3 (1.104.0)
21-
aws-sdk-core (~> 3, >= 3.121.2)
12+
aws-eventstream (1.4.0)
13+
aws-partitions (1.1113.0)
14+
aws-sdk-core (3.225.1)
15+
aws-eventstream (~> 1, >= 1.3.0)
16+
aws-partitions (~> 1, >= 1.992.0)
17+
aws-sigv4 (~> 1.9)
18+
base64
19+
jmespath (~> 1, >= 1.6.1)
20+
logger
21+
aws-sdk-kms (1.104.0)
22+
aws-sdk-core (~> 3, >= 3.225.0)
23+
aws-sigv4 (~> 1.5)
24+
aws-sdk-s3 (1.189.0)
25+
aws-sdk-core (~> 3, >= 3.225.0)
2226
aws-sdk-kms (~> 1)
23-
aws-sigv4 (~> 1.4)
24-
aws-sigv4 (1.4.0)
27+
aws-sigv4 (~> 1.5)
28+
aws-sigv4 (1.12.0)
2529
aws-eventstream (~> 1, >= 1.0.2)
2630
babosa (1.0.4)
27-
claide (1.0.3)
31+
base64 (0.3.0)
32+
claide (1.1.0)
2833
colored (1.2)
2934
colored2 (3.1.2)
3035
commander (4.6.0)
3136
highline (~> 2.0.0)
3237
declarative (0.0.20)
33-
digest-crc (0.6.4)
38+
digest-crc (0.7.0)
3439
rake (>= 12.0.0, < 14.0.0)
35-
domain_name (0.5.20190701)
36-
unf (>= 0.0.5, < 1.0.0)
37-
dotenv (2.7.6)
40+
domain_name (0.6.20240107)
41+
dotenv (2.8.1)
3842
emoji_regex (3.2.3)
39-
excon (0.88.0)
40-
faraday (1.8.0)
43+
excon (0.112.0)
44+
faraday (1.10.4)
4145
faraday-em_http (~> 1.0)
4246
faraday-em_synchrony (~> 1.0)
4347
faraday-excon (~> 1.1)
44-
faraday-httpclient (~> 1.0.1)
48+
faraday-httpclient (~> 1.0)
49+
faraday-multipart (~> 1.0)
4550
faraday-net_http (~> 1.0)
46-
faraday-net_http_persistent (~> 1.1)
51+
faraday-net_http_persistent (~> 1.0)
4752
faraday-patron (~> 1.0)
4853
faraday-rack (~> 1.0)
49-
multipart-post (>= 1.2, < 3)
54+
faraday-retry (~> 1.0)
5055
ruby2_keywords (>= 0.0.4)
5156
faraday-cookie_jar (0.0.7)
5257
faraday (>= 0.8.0)
@@ -55,21 +60,24 @@ GEM
5560
faraday-em_synchrony (1.0.0)
5661
faraday-excon (1.1.0)
5762
faraday-httpclient (1.0.1)
58-
faraday-net_http (1.0.1)
63+
faraday-multipart (1.1.0)
64+
multipart-post (~> 2.0)
65+
faraday-net_http (1.0.2)
5966
faraday-net_http_persistent (1.2.0)
6067
faraday-patron (1.0.0)
6168
faraday-rack (1.0.0)
62-
faraday_middleware (1.2.0)
69+
faraday-retry (1.0.3)
70+
faraday_middleware (1.2.1)
6371
faraday (~> 1.0)
64-
fastimage (2.2.5)
65-
fastlane (2.197.0)
72+
fastimage (2.4.0)
73+
fastlane (2.227.2)
6674
CFPropertyList (>= 2.3, < 4.0.0)
6775
addressable (>= 2.8, < 3.0.0)
6876
artifactory (~> 3.0)
6977
aws-sdk-s3 (~> 1.0)
7078
babosa (>= 1.0.3, < 2.0.0)
7179
bundler (>= 1.12.0, < 3.0.0)
72-
colored
80+
colored (~> 1.2)
7381
commander (~> 4.6)
7482
dotenv (>= 2.1.1, < 3.0.0)
7583
emoji_regex (>= 0.1, < 4.0)
@@ -78,139 +86,142 @@ GEM
7886
faraday-cookie_jar (~> 0.0.6)
7987
faraday_middleware (~> 1.0)
8088
fastimage (>= 2.1.0, < 3.0.0)
89+
fastlane-sirp (>= 1.0.0)
8190
gh_inspector (>= 1.1.2, < 2.0.0)
8291
google-apis-androidpublisher_v3 (~> 0.3)
8392
google-apis-playcustomapp_v1 (~> 0.1)
93+
google-cloud-env (>= 1.6.0, < 2.0.0)
8494
google-cloud-storage (~> 1.31)
8595
highline (~> 2.0)
96+
http-cookie (~> 1.0.5)
8697
json (< 3.0.0)
8798
jwt (>= 2.1.0, < 3)
8899
mini_magick (>= 4.9.4, < 5.0.0)
89-
multipart-post (~> 2.0.0)
100+
multipart-post (>= 2.0.0, < 3.0.0)
90101
naturally (~> 2.2)
91-
optparse (~> 0.1.1)
102+
optparse (>= 0.1.1, < 1.0.0)
92103
plist (>= 3.1.0, < 4.0.0)
93104
rubyzip (>= 2.0.0, < 3.0.0)
94-
security (= 0.1.3)
105+
security (= 0.1.5)
95106
simctl (~> 1.6.3)
96107
terminal-notifier (>= 2.0.0, < 3.0.0)
97-
terminal-table (>= 1.4.5, < 2.0.0)
108+
terminal-table (~> 3)
98109
tty-screen (>= 0.6.3, < 1.0.0)
99110
tty-spinner (>= 0.8.0, < 1.0.0)
100111
word_wrap (~> 1.0.0)
101112
xcodeproj (>= 1.13.0, < 2.0.0)
102-
xcpretty (~> 0.3.0)
103-
xcpretty-travis-formatter (>= 0.0.3)
113+
xcpretty (~> 0.4.1)
114+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
115+
fastlane-sirp (1.0.0)
116+
sysrandom (~> 1.0)
104117
gh_inspector (1.1.3)
105-
google-apis-androidpublisher_v3 (0.13.0)
106-
google-apis-core (>= 0.4, < 2.a)
107-
google-apis-core (0.4.1)
118+
google-apis-androidpublisher_v3 (0.54.0)
119+
google-apis-core (>= 0.11.0, < 2.a)
120+
google-apis-core (0.11.3)
108121
addressable (~> 2.5, >= 2.5.1)
109122
googleauth (>= 0.16.2, < 2.a)
110123
httpclient (>= 2.8.1, < 3.a)
111124
mini_mime (~> 1.0)
112125
representable (~> 3.0)
113126
retriable (>= 2.0, < 4.a)
114127
rexml
115-
webrick
116-
google-apis-iamcredentials_v1 (0.8.0)
117-
google-apis-core (>= 0.4, < 2.a)
118-
google-apis-playcustomapp_v1 (0.6.0)
119-
google-apis-core (>= 0.4, < 2.a)
120-
google-apis-storage_v1 (0.9.0)
121-
google-apis-core (>= 0.4, < 2.a)
122-
google-cloud-core (1.6.0)
123-
google-cloud-env (~> 1.0)
128+
google-apis-iamcredentials_v1 (0.17.0)
129+
google-apis-core (>= 0.11.0, < 2.a)
130+
google-apis-playcustomapp_v1 (0.13.0)
131+
google-apis-core (>= 0.11.0, < 2.a)
132+
google-apis-storage_v1 (0.31.0)
133+
google-apis-core (>= 0.11.0, < 2.a)
134+
google-cloud-core (1.8.0)
135+
google-cloud-env (>= 1.0, < 3.a)
124136
google-cloud-errors (~> 1.0)
125-
google-cloud-env (1.5.0)
126-
faraday (>= 0.17.3, < 2.0)
127-
google-cloud-errors (1.2.0)
128-
google-cloud-storage (1.34.1)
129-
addressable (~> 2.5)
137+
google-cloud-env (1.6.0)
138+
faraday (>= 0.17.3, < 3.0)
139+
google-cloud-errors (1.5.0)
140+
google-cloud-storage (1.47.0)
141+
addressable (~> 2.8)
130142
digest-crc (~> 0.4)
131143
google-apis-iamcredentials_v1 (~> 0.1)
132-
google-apis-storage_v1 (~> 0.1)
144+
google-apis-storage_v1 (~> 0.31.0)
133145
google-cloud-core (~> 1.6)
134146
googleauth (>= 0.16.2, < 2.a)
135147
mini_mime (~> 1.0)
136-
googleauth (1.1.0)
137-
faraday (>= 0.17.3, < 2.0)
148+
googleauth (1.8.1)
149+
faraday (>= 0.17.3, < 3.a)
138150
jwt (>= 1.4, < 3.0)
139-
memoist (~> 0.16)
140151
multi_json (~> 1.11)
141152
os (>= 0.9, < 2.0)
142153
signet (>= 0.16, < 2.a)
143154
highline (2.0.3)
144-
http-cookie (1.0.4)
155+
http-cookie (1.0.8)
145156
domain_name (~> 0.5)
146-
httpclient (2.8.3)
147-
jmespath (1.6.1)
148-
json (2.6.1)
149-
jwt (2.3.0)
150-
memoist (0.16.2)
151-
mini_magick (4.11.0)
152-
mini_mime (1.1.2)
157+
httpclient (2.9.0)
158+
mutex_m
159+
jmespath (1.6.2)
160+
json (2.12.2)
161+
jwt (2.10.1)
162+
base64
163+
logger (1.7.0)
164+
mini_magick (4.13.2)
165+
mini_mime (1.1.5)
153166
multi_json (1.15.0)
154-
multipart-post (2.0.0)
155-
nanaimo (0.3.0)
156-
naturally (2.2.1)
157-
optparse (0.1.1)
158-
os (1.1.1)
159-
plist (3.6.0)
160-
public_suffix (4.0.6)
161-
rake (13.0.6)
162-
representable (3.1.1)
167+
multipart-post (2.4.1)
168+
mutex_m (0.3.0)
169+
nanaimo (0.4.0)
170+
naturally (2.2.2)
171+
nkf (0.2.0)
172+
optparse (0.6.0)
173+
os (1.1.4)
174+
plist (3.7.2)
175+
public_suffix (6.0.2)
176+
rake (13.3.0)
177+
representable (3.2.0)
163178
declarative (< 0.1.0)
164179
trailblazer-option (>= 0.1.1, < 0.2.0)
165180
uber (< 0.2.0)
166181
retriable (3.1.2)
167-
rexml (3.2.8)
168-
strscan (>= 3.0.9)
169-
rouge (2.0.7)
182+
rexml (3.4.1)
183+
rouge (3.28.0)
170184
ruby2_keywords (0.0.5)
171-
rubyzip (2.3.2)
172-
security (0.1.3)
173-
signet (0.16.0)
185+
rubyzip (2.4.1)
186+
security (0.1.5)
187+
signet (0.20.0)
174188
addressable (~> 2.8)
175-
faraday (>= 0.17.3, < 2.0)
189+
faraday (>= 0.17.5, < 3.a)
176190
jwt (>= 1.5, < 3.0)
177191
multi_json (~> 1.10)
178-
simctl (1.6.8)
192+
simctl (1.6.10)
179193
CFPropertyList
180194
naturally
181-
strscan (3.1.0)
195+
sysrandom (1.0.5)
182196
terminal-notifier (2.0.0)
183-
terminal-table (1.8.0)
184-
unicode-display_width (~> 1.1, >= 1.1.1)
185-
trailblazer-option (0.1.1)
197+
terminal-table (3.0.2)
198+
unicode-display_width (>= 1.1.1, < 3)
199+
trailblazer-option (0.1.2)
186200
tty-cursor (0.7.1)
187-
tty-screen (0.8.1)
201+
tty-screen (0.8.2)
188202
tty-spinner (0.9.3)
189203
tty-cursor (~> 0.7)
190204
uber (0.1.0)
191-
unf (0.1.4)
192-
unf_ext
193-
unf_ext (0.0.8)
194-
unicode-display_width (1.8.0)
195-
webrick (1.7.0)
205+
unicode-display_width (2.6.0)
196206
word_wrap (1.0.0)
197-
xcodeproj (1.21.0)
207+
xcodeproj (1.27.0)
198208
CFPropertyList (>= 2.3.3, < 4.0)
199209
atomos (~> 0.1.3)
200210
claide (>= 1.0.2, < 2.0)
201211
colored2 (~> 3.1)
202-
nanaimo (~> 0.3.0)
203-
rexml (~> 3.2.4)
204-
xcpretty (0.3.0)
205-
rouge (~> 2.0.7)
212+
nanaimo (~> 0.4.0)
213+
rexml (>= 3.3.6, < 4.0)
214+
xcpretty (0.4.1)
215+
rouge (~> 3.28.0)
206216
xcpretty-travis-formatter (1.0.1)
207217
xcpretty (~> 0.2, >= 0.0.7)
208218

209219
PLATFORMS
220+
arm64-darwin-24
210221
ruby
211222

212223
DEPENDENCIES
213224
fastlane
214225

215226
BUNDLED WITH
216-
1.17.3
227+
2.6.9

OpenDocumentReader/DocumentViewController.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import AppTrackingTransparency
1616
import AdSupport
1717

1818
// taken from: https://developer.apple.com/documentation/uikit/view_controllers/building_a_document_browser-based_app
19-
class DocumentViewController: UIViewController, DocumentDelegate, GADBannerViewDelegate, UISearchBarDelegate {
19+
class DocumentViewController: UIViewController, DocumentDelegate, BannerViewDelegate, UISearchBarDelegate {
2020

2121
private var browserTransition: DocumentBrowserTransitioningDelegate?
2222
public var transitionController: UIDocumentBrowserTransitionController? {
@@ -44,7 +44,7 @@ class DocumentViewController: UIViewController, DocumentDelegate, GADBannerViewD
4444
@IBOutlet weak var webview: WKWebView!
4545
@IBOutlet weak var progressBar: UIProgressView!
4646
@IBOutlet weak var menuButton: UIBarButtonItem!
47-
@IBOutlet weak var bannerView: GADBannerView!
47+
@IBOutlet weak var bannerView: BannerView!
4848
@IBOutlet weak var bannerViewHeight: NSLayoutConstraint!
4949
@IBOutlet weak var barButtonItem: UIBarButtonItem!
5050
@IBOutlet weak var searchButton: UIBarButtonItem!
@@ -139,16 +139,16 @@ class DocumentViewController: UIViewController, DocumentDelegate, GADBannerViewD
139139
}()
140140
let viewWidth = frame.size.width
141141

142-
bannerView.adSize = GADCurrentOrientationAnchoredAdaptiveBannerAdSizeWithWidth(viewWidth)
143-
bannerView.load(GADRequest())
142+
bannerView.adSize = currentOrientationAnchoredAdaptiveBanner(width: viewWidth)
143+
bannerView.load(Request())
144144
}
145145

146146
func hideBannerView() {
147147
bannerView.isHidden = true
148148
bannerViewHeight.constant = 0.0
149149
}
150150

151-
func bannerView(_ bannerView: GADBannerView, didFailToReceiveAdWithError error: Error) {
151+
func bannerView(_ bannerView: BannerView, didFailToReceiveAdWithError error: Error) {
152152
hideBannerView()
153153
}
154154

Podfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,3 @@ post_install do |installer|
2323
end
2424
end
2525
end
26-

0 commit comments

Comments
 (0)