Skip to content

Commit 285c8e1

Browse files
authored
Merge pull request #484 from nightscout/release/0.2.4
Release v0.2.4
2 parents dbb44c2 + 67932ce commit 285c8e1

File tree

12 files changed

+95
-64
lines changed

12 files changed

+95
-64
lines changed

.github/ISSUE_TEMPLATE/feature-request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "\U0001F4A1 Feature request \U0001F4A1"
33
about: Suggest an idea for this project
44
title: ''
55
labels: ['needs-triage']
6-
types: "feature"
6+
type: "feature"
77
assignees: ''
88
projects: ['nightscout/2']
99

.github/workflows/add_identifiers.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,8 @@ jobs:
1212
identifiers:
1313
name: Add Identifiers
1414
needs: validate
15-
runs-on: macos-14
15+
runs-on: macos-15
1616
steps:
17-
# Uncomment to manually select latest Xcode if needed
18-
#- name: Select Latest Xcode
19-
# run: "sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer"
20-
2117
# Checks-out the repo
2218
- name: Checkout Repo
2319
uses: actions/checkout@v4

.github/workflows/build_trio.yml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ jobs:
188188
build:
189189
name: Build
190190
needs: [check_certs, check_alive_and_permissions, check_latest_from_upstream]
191-
runs-on: macos-14
191+
runs-on: macos-15
192192
permissions:
193193
contents: write
194194
if:
@@ -200,7 +200,7 @@ jobs:
200200
)
201201
steps:
202202
- name: Select Xcode version
203-
run: "sudo xcode-select --switch /Applications/Xcode_15.4.app/Contents/Developer"
203+
run: "sudo xcode-select --switch /Applications/Xcode_16.3.app/Contents/Developer"
204204

205205
- name: Checkout Repo for syncing
206206
if: |
@@ -252,6 +252,36 @@ jobs:
252252
submodules: recursive
253253
ref: ${{ env.TARGET_BRANCH }}
254254

255+
# Customize Trio: Use patches or download and apply patches from GitHub
256+
- name: Customize Trio
257+
run: |
258+
259+
# Trio workspace patches
260+
# -applies any patches located in the Trio/patches/ directory
261+
if $(ls ./patches/* &> /dev/null); then
262+
git apply ./patches/* --allow-empty -v --whitespace=fix
263+
fi
264+
265+
# Download and apply Trio patches from GitHub:
266+
# Template for customizing Trio code (as opposed to submodule code)
267+
# Remove the "#" sign from the beginning of the line below to activate
268+
# and then replace the alphanumeric string with your SHA, this SHA is NOT valid
269+
#curl https://github.com/nightscout/Trio/commit/d206432b024279ef710df462b20bd464cd9682d4.patch | git apply -v --whitespace=fix
270+
271+
# Download and apply Submodule patches from GitHub:
272+
# Template for customizing submodules (you must edit the submodule name)
273+
# This example is for G7SensorKit showing you can apply multiple commits, in the proper order
274+
# Remove the "#" sign from the beginning of the lines below to activate
275+
# This example applies 3 commits from the scan-fix folder; valid only when these are not already in Trio
276+
#curl https://github.com/loopandlearn/G7SensorKit/commit/ba44beb3d1491c453f4f438443c3f8ba29146ab3.patch | git apply --directory=G7SensorKit -v --whitespace=fix
277+
#curl https://github.com/loopandlearn/G7SensorKit/commit/d86ac8e9cd523d1267587dd70c96597125eef7ab.patch | git apply --directory=G7SensorKit -v --whitespace=fix
278+
#curl https://github.com/loopandlearn/G7SensorKit/commit/205054e7537723c2aec58d807634b4853f687244.patch | git apply --directory=G7SensorKit -v --whitespace=fix
279+
280+
# Add patches for additional customization by following the templates above,
281+
# and make sure to specify the submodule by setting "--directory=(submodule_name)".
282+
# Several patches may be added per submodule.
283+
# Adding comments (#) is strongly recommended to easily tell the individual patches apart.
284+
255285
# Patch Fastlane Match to not print tables
256286
- name: Patch Match Tables
257287
run: |

.github/workflows/create_certs.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@ jobs:
2121
create_certs:
2222
name: Certificates
2323
needs: validate
24-
runs-on: macos-14
24+
runs-on: macos-15
2525
outputs:
2626
new_certificate_needed: ${{ steps.set_output.outputs.new_certificate_needed }}
2727

2828
steps:
29-
# Uncomment to manually select latest Xcode if needed
30-
#- name: Select Latest Xcode
31-
# run: "sudo xcode-select --switch /Applications/Xcode_13.0.app/Contents/Developer"
32-
3329
# Checks-out the repo
3430
- name: Checkout Repo
3531
uses: actions/checkout@v4
@@ -94,7 +90,7 @@ jobs:
9490
nuke_certs:
9591
name: Nuke certificates
9692
needs: [validate, create_certs]
97-
runs-on: macos-14
93+
runs-on: macos-15
9894
if: ${{ (needs.create_certs.outputs.new_certificate_needed == 'true' && vars.ENABLE_NUKE_CERTS == 'true') || vars.FORCE_NUKE_CERTS == 'true' }}
9995
steps:
10096
- name: Output from step id 'check_certs'

.github/workflows/validate_secrets.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [workflow_call, workflow_dispatch]
55
jobs:
66
validate-access-token:
77
name: Access
8-
runs-on: macos-14
8+
runs-on: macos-15
99
env:
1010
GH_PAT: ${{ secrets.GH_PAT }}
1111
GH_TOKEN: ${{ secrets.GH_PAT }}
@@ -74,7 +74,7 @@ jobs:
7474
validate-match-secrets:
7575
name: Match-Secrets
7676
needs: validate-access-token
77-
runs-on: macos-14
77+
runs-on: macos-15
7878
env:
7979
GH_TOKEN: ${{ secrets.GH_PAT }}
8080
steps:
@@ -112,7 +112,7 @@ jobs:
112112
validate-fastlane-secrets:
113113
name: Fastlane
114114
needs: [validate-access-token, validate-match-secrets]
115-
runs-on: macos-14
115+
runs-on: macos-15
116116
env:
117117
GH_PAT: ${{ secrets.GH_PAT }}
118118
GH_TOKEN: ${{ secrets.GH_PAT }}

Config.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_DISPLAY_NAME = Trio
2-
APP_VERSION = 0.2.3
2+
APP_VERSION = 0.2.4
33
APP_BUILD_NUMBER = 1
44
COPYRIGHT_NOTICE =
55
DEVELOPER_TEAM = ##TEAM_ID##

Gemfile.lock

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,23 @@ GEM
99
public_suffix (>= 2.0.2, < 7.0)
1010
artifactory (3.0.17)
1111
atomos (0.1.3)
12-
aws-eventstream (1.3.0)
13-
aws-partitions (1.981.0)
14-
aws-sdk-core (3.209.1)
12+
aws-eventstream (1.3.2)
13+
aws-partitions (1.1086.0)
14+
aws-sdk-core (3.222.1)
1515
aws-eventstream (~> 1, >= 1.3.0)
16-
aws-partitions (~> 1, >= 1.651.0)
16+
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)
18+
base64
1819
jmespath (~> 1, >= 1.6.1)
19-
aws-sdk-kms (1.94.0)
20-
aws-sdk-core (~> 3, >= 3.207.0)
20+
logger
21+
aws-sdk-kms (1.99.0)
22+
aws-sdk-core (~> 3, >= 3.216.0)
2123
aws-sigv4 (~> 1.5)
22-
aws-sdk-s3 (1.166.0)
23-
aws-sdk-core (~> 3, >= 3.207.0)
24+
aws-sdk-s3 (1.183.0)
25+
aws-sdk-core (~> 3, >= 3.216.0)
2426
aws-sdk-kms (~> 1)
2527
aws-sigv4 (~> 1.5)
26-
aws-sigv4 (1.10.0)
28+
aws-sigv4 (1.11.0)
2729
aws-eventstream (~> 1, >= 1.0.2)
2830
babosa (1.0.4)
2931
base64 (0.2.0)
@@ -33,13 +35,12 @@ GEM
3335
commander (4.6.0)
3436
highline (~> 2.0.0)
3537
declarative (0.0.20)
36-
digest-crc (0.6.5)
38+
digest-crc (0.7.0)
3739
rake (>= 12.0.0, < 14.0.0)
38-
domain_name (0.5.20190701)
39-
unf (>= 0.0.5, < 1.0.0)
40+
domain_name (0.6.20240107)
4041
dotenv (2.8.1)
4142
emoji_regex (3.2.3)
42-
excon (0.109.0)
43+
excon (0.112.0)
4344
faraday (1.10.4)
4445
faraday-em_http (~> 1.0)
4546
faraday-em_synchrony (~> 1.0)
@@ -59,17 +60,17 @@ GEM
5960
faraday-em_synchrony (1.0.0)
6061
faraday-excon (1.1.0)
6162
faraday-httpclient (1.0.1)
62-
faraday-multipart (1.0.4)
63-
multipart-post (~> 2)
63+
faraday-multipart (1.1.0)
64+
multipart-post (~> 2.0)
6465
faraday-net_http (1.0.2)
6566
faraday-net_http_persistent (1.2.0)
6667
faraday-patron (1.0.0)
6768
faraday-rack (1.0.0)
6869
faraday-retry (1.0.3)
6970
faraday_middleware (1.2.1)
7071
faraday (~> 1.0)
71-
fastimage (2.3.1)
72-
fastlane (2.223.1)
72+
fastimage (2.4.0)
73+
fastlane (2.227.1)
7374
CFPropertyList (>= 2.3, < 4.0.0)
7475
addressable (>= 2.8, < 3.0.0)
7576
artifactory (~> 3.0)
@@ -85,6 +86,7 @@ GEM
8586
faraday-cookie_jar (~> 0.0.6)
8687
faraday_middleware (~> 1.0)
8788
fastimage (>= 2.1.0, < 3.0.0)
89+
fastlane-sirp (>= 1.0.0)
8890
gh_inspector (>= 1.1.2, < 2.0.0)
8991
google-apis-androidpublisher_v3 (~> 0.3)
9092
google-apis-playcustomapp_v1 (~> 0.1)
@@ -108,8 +110,10 @@ GEM
108110
tty-spinner (>= 0.8.0, < 1.0.0)
109111
word_wrap (~> 1.0.0)
110112
xcodeproj (>= 1.13.0, < 2.0.0)
111-
xcpretty (~> 0.3.0)
113+
xcpretty (~> 0.4.1)
112114
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
115+
fastlane-sirp (1.0.0)
116+
sysrandom (~> 1.0)
113117
gh_inspector (1.1.3)
114118
google-apis-androidpublisher_v3 (0.54.0)
115119
google-apis-core (>= 0.11.0, < 2.a)
@@ -125,19 +129,19 @@ GEM
125129
google-apis-core (>= 0.11.0, < 2.a)
126130
google-apis-playcustomapp_v1 (0.13.0)
127131
google-apis-core (>= 0.11.0, < 2.a)
128-
google-apis-storage_v1 (0.29.0)
132+
google-apis-storage_v1 (0.31.0)
129133
google-apis-core (>= 0.11.0, < 2.a)
130-
google-cloud-core (1.6.1)
134+
google-cloud-core (1.8.0)
131135
google-cloud-env (>= 1.0, < 3.a)
132136
google-cloud-errors (~> 1.0)
133137
google-cloud-env (1.6.0)
134138
faraday (>= 0.17.3, < 3.0)
135-
google-cloud-errors (1.3.1)
136-
google-cloud-storage (1.45.0)
139+
google-cloud-errors (1.5.0)
140+
google-cloud-storage (1.47.0)
137141
addressable (~> 2.8)
138142
digest-crc (~> 0.4)
139143
google-apis-iamcredentials_v1 (~> 0.1)
140-
google-apis-storage_v1 (~> 0.29.0)
144+
google-apis-storage_v1 (~> 0.31.0)
141145
google-cloud-core (~> 1.6)
142146
googleauth (>= 0.16.2, < 2.a)
143147
mini_mime (~> 1.0)
@@ -148,43 +152,47 @@ GEM
148152
os (>= 0.9, < 2.0)
149153
signet (>= 0.16, < 2.a)
150154
highline (2.0.3)
151-
http-cookie (1.0.7)
155+
http-cookie (1.0.8)
152156
domain_name (~> 0.5)
153-
httpclient (2.8.3)
157+
httpclient (2.9.0)
158+
mutex_m
154159
jmespath (1.6.2)
155-
json (2.7.2)
156-
jwt (2.9.1)
160+
json (2.10.2)
161+
jwt (2.10.1)
157162
base64
163+
logger (1.7.0)
158164
mini_magick (4.13.2)
159165
mini_mime (1.1.5)
160166
multi_json (1.15.0)
161167
multipart-post (2.4.1)
162-
nanaimo (0.3.0)
168+
mutex_m (0.3.0)
169+
nanaimo (0.4.0)
163170
naturally (2.2.1)
164171
nkf (0.2.0)
165-
optparse (0.5.0)
172+
optparse (0.6.0)
166173
os (1.1.4)
167-
plist (3.7.1)
168-
public_suffix (5.1.1)
174+
plist (3.7.2)
175+
public_suffix (6.0.1)
169176
rake (13.2.1)
170177
representable (3.2.0)
171178
declarative (< 0.1.0)
172179
trailblazer-option (>= 0.1.1, < 0.2.0)
173180
uber (< 0.2.0)
174181
retriable (3.1.2)
175-
rexml (3.3.7)
176-
rouge (2.0.7)
182+
rexml (3.4.1)
183+
rouge (3.28.0)
177184
ruby2_keywords (0.0.5)
178-
rubyzip (2.3.2)
185+
rubyzip (2.4.1)
179186
security (0.1.5)
180-
signet (0.18.0)
187+
signet (0.19.0)
181188
addressable (~> 2.8)
182189
faraday (>= 0.17.5, < 3.a)
183190
jwt (>= 1.5, < 3.0)
184191
multi_json (~> 1.10)
185192
simctl (1.6.10)
186193
CFPropertyList
187194
naturally
195+
sysrandom (1.0.5)
188196
terminal-notifier (2.0.0)
189197
terminal-table (3.0.2)
190198
unicode-display_width (>= 1.1.1, < 3)
@@ -194,25 +202,25 @@ GEM
194202
tty-spinner (0.9.3)
195203
tty-cursor (~> 0.7)
196204
uber (0.1.0)
197-
unf (0.2.0)
198205
unicode-display_width (2.6.0)
199206
word_wrap (1.0.0)
200-
xcodeproj (1.25.0)
207+
xcodeproj (1.27.0)
201208
CFPropertyList (>= 2.3.3, < 4.0)
202209
atomos (~> 0.1.3)
203210
claide (>= 1.0.2, < 2.0)
204211
colored2 (~> 3.1)
205-
nanaimo (~> 0.3.0)
206-
rexml (>= 3.3.2, < 4.0)
207-
xcpretty (0.3.0)
208-
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)
209216
xcpretty-travis-formatter (1.0.1)
210217
xcpretty (~> 0.2, >= 0.0.7)
211218

212219
PLATFORMS
213220
arm64-darwin-21
214221
arm64-darwin-22
215222
arm64-darwin-23
223+
arm64-darwin-24
216224
x86_64-darwin-19
217225
x86_64-darwin-24
218226
x86_64-linux
@@ -221,4 +229,4 @@ DEPENDENCIES
221229
fastlane
222230

223231
BUNDLED WITH
224-
2.4.19
232+
2.6.2

MinimedKit

OmniBLE

0 commit comments

Comments
 (0)