Skip to content

Commit 7608c11

Browse files
timbmsdigitaldan
timbms
and
digitaldan
authored
Updatefastlane (#859)
* Fixes networking for the Apple Watch Signed-off-by: Dan Cunningham <[email protected]> * Clean up a bit Signed-off-by: Dan Cunningham <[email protected]> * support actions when launching app Signed-off-by: Dan Cunningham <[email protected]> * Reset xcode scheme Signed-off-by: Dan Cunningham <[email protected]> * small formatting tweaks Signed-off-by: Dan Cunningham <[email protected]> * Update fastlane with bundle update fastlane and fastlane-plugins Upgrading runs-on from macos14 to macos-15 Upgrading from maxim-lobanov/setup-xcode@v1 to maxim-lobanov/[email protected] Update devices for run_tests from iPhone 15 Pro to iPhone 15 Pro (17.5) Signed-off-by: Tim Bert <[email protected]> --------- Signed-off-by: Dan Cunningham <[email protected]> Signed-off-by: Tim Bert <[email protected]> Co-authored-by: Dan Cunningham <[email protected]>
1 parent 922278c commit 7608c11

16 files changed

+254
-162
lines changed

‎.github/workflows/pull_requests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77

88
jobs:
99
build_and_test:
10-
runs-on: macos-14
10+
runs-on: macos-15
1111
if: ${{ github.event.pull_request.draft == false }}
1212
steps:
13-
- uses: maxim-lobanov/setup-xcode@v1
13+
- uses: maxim-lobanov/setup-xcode@v1.6.0
1414
with:
1515
xcode-version: latest-stable
1616

‎BuildTools/Empty.swift

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88
// http://www.eclipse.org/legal/epl-2.0
99
//
1010
// SPDX-License-Identifier: EPL-2.0
11-

‎Gemfile.lock

+25-25
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ GEM
1010
artifactory (3.0.17)
1111
atomos (0.1.3)
1212
aws-eventstream (1.3.0)
13-
aws-partitions (1.998.0)
14-
aws-sdk-core (3.211.0)
13+
aws-partitions (1.1042.0)
14+
aws-sdk-core (3.216.1)
1515
aws-eventstream (~> 1, >= 1.3.0)
1616
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)
1818
jmespath (~> 1, >= 1.6.1)
19-
aws-sdk-kms (1.95.0)
20-
aws-sdk-core (~> 3, >= 3.210.0)
19+
aws-sdk-kms (1.97.0)
20+
aws-sdk-core (~> 3, >= 3.216.0)
2121
aws-sigv4 (~> 1.5)
22-
aws-sdk-s3 (1.169.0)
23-
aws-sdk-core (~> 3, >= 3.210.0)
22+
aws-sdk-s3 (1.178.0)
23+
aws-sdk-core (~> 3, >= 3.216.0)
2424
aws-sdk-kms (~> 1)
2525
aws-sigv4 (~> 1.5)
26-
aws-sigv4 (1.10.1)
26+
aws-sigv4 (1.11.0)
2727
aws-eventstream (~> 1, >= 1.0.2)
2828
babosa (1.0.4)
2929
base64 (0.2.0)
@@ -58,17 +58,17 @@ GEM
5858
faraday-em_synchrony (1.0.0)
5959
faraday-excon (1.1.0)
6060
faraday-httpclient (1.0.1)
61-
faraday-multipart (1.0.4)
62-
multipart-post (~> 2)
61+
faraday-multipart (1.1.0)
62+
multipart-post (~> 2.0)
6363
faraday-net_http (1.0.2)
6464
faraday-net_http_persistent (1.2.0)
6565
faraday-patron (1.0.0)
6666
faraday-rack (1.0.0)
6767
faraday-retry (1.0.3)
6868
faraday_middleware (1.2.1)
6969
faraday (~> 1.0)
70-
fastimage (2.3.1)
71-
fastlane (2.225.0)
70+
fastimage (2.4.0)
71+
fastlane (2.226.0)
7272
CFPropertyList (>= 2.3, < 4.0.0)
7373
addressable (>= 2.8, < 3.0.0)
7474
artifactory (~> 3.0)
@@ -108,10 +108,10 @@ GEM
108108
tty-spinner (>= 0.8.0, < 1.0.0)
109109
word_wrap (~> 1.0.0)
110110
xcodeproj (>= 1.13.0, < 2.0.0)
111-
xcpretty (~> 0.3.0)
111+
xcpretty (~> 0.4.0)
112112
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
113113
fastlane-plugin-changelog (0.16.0)
114-
fastlane-plugin-versioning (0.6.0)
114+
fastlane-plugin-versioning (0.7.1)
115115
fastlane-sirp (1.0.0)
116116
sysrandom (~> 1.0)
117117
gh_inspector (1.1.3)
@@ -152,12 +152,12 @@ GEM
152152
os (>= 0.9, < 2.0)
153153
signet (>= 0.16, < 2.a)
154154
highline (2.0.3)
155-
http-cookie (1.0.7)
155+
http-cookie (1.0.8)
156156
domain_name (~> 0.5)
157157
httpclient (2.8.3)
158158
jmespath (1.6.2)
159-
json (2.7.5)
160-
jwt (2.9.3)
159+
json (2.9.1)
160+
jwt (2.10.1)
161161
base64
162162
mini_magick (4.13.2)
163163
mini_mime (1.1.5)
@@ -166,20 +166,20 @@ GEM
166166
nanaimo (0.4.0)
167167
naturally (2.2.1)
168168
nkf (0.2.0)
169-
optparse (0.5.0)
169+
optparse (0.6.0)
170170
os (1.1.4)
171-
plist (3.7.1)
171+
plist (3.7.2)
172172
public_suffix (6.0.1)
173173
rake (13.2.1)
174174
representable (3.2.0)
175175
declarative (< 0.1.0)
176176
trailblazer-option (>= 0.1.1, < 0.2.0)
177177
uber (< 0.2.0)
178178
retriable (3.1.2)
179-
rexml (3.3.9)
180-
rouge (2.0.7)
179+
rexml (3.4.0)
180+
rouge (3.28.0)
181181
ruby2_keywords (0.0.5)
182-
rubyzip (2.3.2)
182+
rubyzip (2.4.1)
183183
security (0.1.5)
184184
signet (0.19.0)
185185
addressable (~> 2.8)
@@ -201,15 +201,15 @@ GEM
201201
uber (0.1.0)
202202
unicode-display_width (2.6.0)
203203
word_wrap (1.0.0)
204-
xcodeproj (1.26.0)
204+
xcodeproj (1.27.0)
205205
CFPropertyList (>= 2.3.3, < 4.0)
206206
atomos (~> 0.1.3)
207207
claide (>= 1.0.2, < 2.0)
208208
colored2 (~> 3.1)
209209
nanaimo (~> 0.4.0)
210210
rexml (>= 3.3.6, < 4.0)
211-
xcpretty (0.3.0)
212-
rouge (~> 2.0.7)
211+
xcpretty (0.4.0)
212+
rouge (~> 3.28.0)
213213
xcpretty-travis-formatter (1.0.1)
214214
xcpretty (~> 0.2, >= 0.0.7)
215215

@@ -222,4 +222,4 @@ DEPENDENCIES
222222
fastlane-plugin-versioning
223223

224224
BUNDLED WITH
225-
2.5.22
225+
2.6.2

‎NotificationService/NotificationService.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class NotificationService: UNNotificationServiceExtension {
152152
url: Preferences.remoteUrl,
153153
priority: 1
154154
)
155-
NetworkTracker.shared.startTracking(connectionConfigurations: [connection1, connection2], username: Preferences.username, password: Preferences.password, alwaysSendBasicAuth: Preferences.alwaysSendCreds)
155+
NetworkTracker.shared.startTracking(connectionConfigurations: [connection1, connection2], username: Preferences.username, password: Preferences.password, alwaysSendBasicAuth: Preferences.alwaysSendCreds, ignoreSSLVerification: Preferences.ignoreSSL)
156156
NetworkTracker.shared.waitForActiveConnection { activeConnection in
157157
if let openHABUrl = activeConnection?.configuration.url, let uurl = URL(string: openHABUrl) {
158158
client.downloadFile(url: uurl.appendingPathComponent(url), completionHandler: downloadCompletionHandler)
@@ -182,7 +182,7 @@ class NotificationService: UNNotificationServiceExtension {
182182
url: Preferences.remoteUrl,
183183
priority: 1
184184
)
185-
NetworkTracker.shared.startTracking(connectionConfigurations: [connection1, connection2], username: Preferences.username, password: Preferences.password, alwaysSendBasicAuth: Preferences.alwaysSendCreds)
185+
NetworkTracker.shared.startTracking(connectionConfigurations: [connection1, connection2], username: Preferences.username, password: Preferences.password, alwaysSendBasicAuth: Preferences.alwaysSendCreds, ignoreSSLVerification: Preferences.ignoreSSL)
186186
NetworkTracker.shared.waitForActiveConnection { activeConnection in
187187
if let openHABUrl = activeConnection?.configuration.url, let url = URL(string: openHABUrl) {
188188
client.getItem(baseURL: url, itemName: itemName) { item, error in

0 commit comments

Comments
 (0)