Skip to content

Commit a750371

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into aibarcode
2 parents c724cb5 + 6c81cf3 commit a750371

File tree

65 files changed

+1888
-671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1888
-671
lines changed

.github/workflows/unit_tests.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: Select Xcode version
31-
run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
31+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
3232

3333
- name: Checkout code
3434
uses: actions/checkout@v4
@@ -55,13 +55,16 @@ jobs:
5555
echo "📂 Contents of .build:"
5656
ls -lah .build || echo ".build directory not found"
5757
58+
- name: List available simulators
59+
run: xcrun simctl list devices available
60+
5861
- name: Build for testing
5962
run: |
6063
set -o pipefail && \
6164
time xcodebuild build-for-testing \
6265
-workspace Trio.xcworkspace \
6366
-scheme "Trio Tests" \
64-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.4' \
67+
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.5' \
6568
6669
- name: Check for uncommitted changes
6770
run: |
@@ -104,7 +107,7 @@ jobs:
104107
time xcodebuild test-without-building \
105108
-workspace Trio.xcworkspace \
106109
-scheme "Trio Tests" \
107-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.4' \
110+
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.5' \
108111
$([ "$ENABLE_PARALLEL_TESTING" = "true" ] && echo "-parallel-testing-enabled YES") \
109112
2>&1 | tee xcodebuild.log
110113

CGMBLEKit

Config.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
1919

2020
// The developers set the version numbers, please leave them alone
2121
APP_VERSION = 0.6.0
22-
APP_DEV_VERSION = 0.6.0.37
22+
APP_DEV_VERSION = 0.6.0.48
2323
APP_BUILD_NUMBER = 1
2424
COPYRIGHT_NOTICE =
2525

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source "https://rubygems.org"
22

3-
gem "fastlane", "2.230.0"
3+
gem "fastlane", "2.231.0"

Gemfile.lock

Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.7)
5-
base64
6-
nkf
7-
rexml
4+
CFPropertyList (3.0.8)
85
abbrev (0.1.2)
9-
addressable (2.8.7)
10-
public_suffix (>= 2.0.2, < 7.0)
6+
addressable (2.8.8)
7+
public_suffix (>= 2.0.2, < 8.0)
118
artifactory (3.0.17)
129
atomos (0.1.3)
1310
aws-eventstream (1.4.0)
14-
aws-partitions (1.1163.0)
15-
aws-sdk-core (3.232.0)
11+
aws-partitions (1.1206.0)
12+
aws-sdk-core (3.241.4)
1613
aws-eventstream (~> 1, >= 1.3.0)
1714
aws-partitions (~> 1, >= 1.992.0)
1815
aws-sigv4 (~> 1.9)
1916
base64
2017
bigdecimal
2118
jmespath (~> 1, >= 1.6.1)
2219
logger
23-
aws-sdk-kms (1.112.0)
24-
aws-sdk-core (~> 3, >= 3.231.0)
20+
aws-sdk-kms (1.121.0)
21+
aws-sdk-core (~> 3, >= 3.241.4)
2522
aws-sigv4 (~> 1.5)
26-
aws-sdk-s3 (1.199.0)
27-
aws-sdk-core (~> 3, >= 3.231.0)
23+
aws-sdk-s3 (1.211.0)
24+
aws-sdk-core (~> 3, >= 3.241.3)
2825
aws-sdk-kms (~> 1)
2926
aws-sigv4 (~> 1.5)
3027
aws-sigv4 (1.12.1)
3128
aws-eventstream (~> 1, >= 1.0.2)
3229
babosa (1.0.4)
3330
base64 (0.2.0)
34-
bigdecimal (3.2.3)
31+
bigdecimal (4.0.1)
3532
claide (1.1.0)
3633
colored (1.2)
3734
colored2 (3.1.2)
@@ -45,44 +42,40 @@ GEM
4542
dotenv (2.8.1)
4643
emoji_regex (3.2.3)
4744
excon (0.112.0)
48-
faraday (1.10.4)
45+
faraday (1.8.0)
4946
faraday-em_http (~> 1.0)
5047
faraday-em_synchrony (~> 1.0)
5148
faraday-excon (~> 1.1)
52-
faraday-httpclient (~> 1.0)
53-
faraday-multipart (~> 1.0)
49+
faraday-httpclient (~> 1.0.1)
5450
faraday-net_http (~> 1.0)
55-
faraday-net_http_persistent (~> 1.0)
51+
faraday-net_http_persistent (~> 1.1)
5652
faraday-patron (~> 1.0)
5753
faraday-rack (~> 1.0)
58-
faraday-retry (~> 1.0)
54+
multipart-post (>= 1.2, < 3)
5955
ruby2_keywords (>= 0.0.4)
60-
faraday-cookie_jar (0.0.7)
56+
faraday-cookie_jar (0.0.8)
6157
faraday (>= 0.8.0)
62-
http-cookie (~> 1.0.0)
58+
http-cookie (>= 1.0.0)
6359
faraday-em_http (1.0.0)
6460
faraday-em_synchrony (1.0.1)
6561
faraday-excon (1.1.0)
6662
faraday-httpclient (1.0.1)
67-
faraday-multipart (1.1.1)
68-
multipart-post (~> 2.0)
6963
faraday-net_http (1.0.2)
7064
faraday-net_http_persistent (1.2.0)
7165
faraday-patron (1.0.0)
7266
faraday-rack (1.0.0)
73-
faraday-retry (1.0.3)
7467
faraday_middleware (1.2.1)
7568
faraday (~> 1.0)
7669
fastimage (2.4.0)
77-
fastlane (2.230.0)
70+
fastlane (2.231.0)
7871
CFPropertyList (>= 2.3, < 4.0.0)
7972
abbrev (~> 0.1.2)
8073
addressable (>= 2.8, < 3.0.0)
8174
artifactory (~> 3.0)
8275
aws-sdk-s3 (~> 1.0)
8376
babosa (>= 1.0.3, < 2.0.0)
8477
base64 (~> 0.2.0)
85-
bundler (>= 1.12.0, < 3.0.0)
78+
bundler (>= 1.17.3, < 5.0.0)
8679
colored (~> 1.2)
8780
commander (~> 4.6)
8881
csv (~> 3.3)
@@ -167,23 +160,23 @@ GEM
167160
httpclient (2.9.0)
168161
mutex_m
169162
jmespath (1.6.2)
170-
json (2.15.0)
163+
json (2.18.0)
171164
jwt (2.10.2)
172165
base64
173166
logger (1.7.0)
174167
mini_magick (4.13.2)
175168
mini_mime (1.1.5)
176-
multi_json (1.17.0)
169+
multi_json (1.19.1)
177170
multipart-post (2.4.1)
178171
mutex_m (0.3.0)
179172
nanaimo (0.4.0)
180173
naturally (2.3.0)
181174
nkf (0.2.0)
182-
optparse (0.6.0)
175+
optparse (0.8.1)
183176
os (1.1.4)
184177
plist (3.7.2)
185-
public_suffix (6.0.2)
186-
rake (13.3.0)
178+
public_suffix (7.0.2)
179+
rake (13.3.1)
187180
representable (3.2.0)
188181
declarative (< 0.1.0)
189182
trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -227,16 +220,11 @@ GEM
227220
xcpretty (~> 0.2, >= 0.0.7)
228221

229222
PLATFORMS
230-
arm64-darwin-21
231-
arm64-darwin-22
232-
arm64-darwin-23
233-
arm64-darwin-24
234-
x86_64-darwin-19
235-
x86_64-darwin-24
236-
x86_64-linux
223+
arm64-darwin-25
224+
ruby
237225

238226
DEPENDENCIES
239-
fastlane (= 2.230.0)
227+
fastlane (= 2.231.0)
240228

241229
BUNDLED WITH
242-
2.6.2
230+
4.0.4

0 commit comments

Comments
 (0)