Skip to content

Commit daec57e

Browse files
ncooke3ncooke3
committed
Merge remote-tracking branch 'origin/main' into mc/spm
2 parents 4aaf45f + f2d5e43 commit daec57e

File tree

11 files changed

+291
-275
lines changed

11 files changed

+291
-275
lines changed

‎.github/workflows/firebaseai.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: firebaseai
22

3+
permissions:
4+
contents: read
5+
36
on:
47
pull_request:
58
paths:
@@ -19,20 +22,24 @@ env:
1922

2023
jobs:
2124
spm:
22-
name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
23-
runs-on: macOS-15
25+
name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.platform }})
2426
strategy:
2527
matrix:
26-
xcode: ["16.4"]
27-
os: [iOS]
2828
include:
29-
- os: iOS
29+
- os: macos-15
30+
xcode: "16.4"
31+
platform: iOS
3032
device: iPhone 16
33+
- os: macos-26
34+
xcode: "26.0"
35+
platform: iOS
36+
device: iPhone 16e
37+
runs-on: ${{ matrix.os }}
3138
env:
3239
SETUP: firebaseai
3340
SPM: true
3441
DIR: firebaseai
35-
OS: ${{ matrix.os }}
42+
OS: ${{ matrix.platform }}
3643
DEVICE: ${{ matrix.device }}
3744
TEST: false
3845
XCODE_VERSION: ${{ matrix.xcode }}
@@ -45,5 +52,5 @@ jobs:
4552
gem install xcpretty
4653
- name: Placeholder GoogleService-Info.plist good enough for build only testing.
4754
run: cp ./mock-GoogleService-Info.plist ./firebaseai/GoogleService-Info.plist
48-
- name: Build and Test SwiftUI (${{ matrix.os }})
55+
- name: Build and Test SwiftUI (${{ matrix.platform }})
4956
run: ./scripts/test.sh

‎Gemfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ GEM
2626
atomos (0.1.3)
2727
base64 (0.3.0)
2828
benchmark (0.4.1)
29-
bigdecimal (3.2.2)
29+
bigdecimal (3.2.3)
3030
claide (1.1.0)
3131
cocoapods (1.16.2)
3232
addressable (~> 2.8)
@@ -67,7 +67,7 @@ GEM
6767
cocoapods-try (1.2.0)
6868
colored2 (3.1.2)
6969
concurrent-ruby (1.3.5)
70-
connection_pool (2.5.3)
70+
connection_pool (2.5.4)
7171
drb (2.2.3)
7272
escape (0.0.4)
7373
ethon (0.17.0)
@@ -90,7 +90,7 @@ GEM
9090
netrc (0.11.0)
9191
nkf (0.2.0)
9292
public_suffix (4.0.7)
93-
rexml (3.4.1)
93+
rexml (3.4.4)
9494
ruby-macho (2.5.1)
9595
securerandom (0.3.2)
9696
typhoeus (1.4.1)

‎abtesting/LegacyABTestingQuickstart/Podfile.lock‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,67 @@
11
PODS:
2-
- FirebaseABTesting (12.1.0):
3-
- FirebaseCore (~> 12.1.0)
4-
- FirebaseAnalytics (12.1.0):
5-
- FirebaseAnalytics/Default (= 12.1.0)
6-
- FirebaseCore (~> 12.1.0)
7-
- FirebaseInstallations (~> 12.1.0)
2+
- FirebaseABTesting (12.3.0):
3+
- FirebaseCore (~> 12.3.0)
4+
- FirebaseAnalytics (12.3.0):
5+
- FirebaseAnalytics/Default (= 12.3.0)
6+
- FirebaseCore (~> 12.3.0)
7+
- FirebaseInstallations (~> 12.3.0)
88
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
99
- GoogleUtilities/MethodSwizzler (~> 8.1)
1010
- GoogleUtilities/Network (~> 8.1)
1111
- "GoogleUtilities/NSData+zlib (~> 8.1)"
1212
- nanopb (~> 3.30910.0)
13-
- FirebaseAnalytics/Default (12.1.0):
14-
- FirebaseCore (~> 12.1.0)
15-
- FirebaseInstallations (~> 12.1.0)
16-
- GoogleAppMeasurement/Default (= 12.1.0)
13+
- FirebaseAnalytics/Default (12.3.0):
14+
- FirebaseCore (~> 12.3.0)
15+
- FirebaseInstallations (~> 12.3.0)
16+
- GoogleAppMeasurement/Default (= 12.3.0)
1717
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
1818
- GoogleUtilities/MethodSwizzler (~> 8.1)
1919
- GoogleUtilities/Network (~> 8.1)
2020
- "GoogleUtilities/NSData+zlib (~> 8.1)"
2121
- nanopb (~> 3.30910.0)
22-
- FirebaseCore (12.1.0):
23-
- FirebaseCoreInternal (~> 12.1.0)
22+
- FirebaseCore (12.3.0):
23+
- FirebaseCoreInternal (~> 12.3.0)
2424
- GoogleUtilities/Environment (~> 8.1)
2525
- GoogleUtilities/Logger (~> 8.1)
26-
- FirebaseCoreInternal (12.1.0):
26+
- FirebaseCoreInternal (12.3.0):
2727
- "GoogleUtilities/NSData+zlib (~> 8.1)"
28-
- FirebaseInstallations (12.1.0):
29-
- FirebaseCore (~> 12.1.0)
28+
- FirebaseInstallations (12.3.0):
29+
- FirebaseCore (~> 12.3.0)
3030
- GoogleUtilities/Environment (~> 8.1)
3131
- GoogleUtilities/UserDefaults (~> 8.1)
3232
- PromisesObjC (~> 2.4)
33-
- FirebaseRemoteConfig (12.1.0):
34-
- FirebaseABTesting (~> 12.1.0)
35-
- FirebaseCore (~> 12.1.0)
36-
- FirebaseInstallations (~> 12.1.0)
37-
- FirebaseRemoteConfigInterop (~> 12.1.0)
38-
- FirebaseSharedSwift (~> 12.1.0)
33+
- FirebaseRemoteConfig (12.3.0):
34+
- FirebaseABTesting (~> 12.3.0)
35+
- FirebaseCore (~> 12.3.0)
36+
- FirebaseInstallations (~> 12.3.0)
37+
- FirebaseRemoteConfigInterop (~> 12.3.0)
38+
- FirebaseSharedSwift (~> 12.3.0)
3939
- GoogleUtilities/Environment (~> 8.1)
4040
- "GoogleUtilities/NSData+zlib (~> 8.1)"
41-
- FirebaseRemoteConfigInterop (12.1.0)
42-
- FirebaseSharedSwift (12.1.0)
43-
- GoogleAdsOnDeviceConversion (2.2.0):
41+
- FirebaseRemoteConfigInterop (12.3.0)
42+
- FirebaseSharedSwift (12.3.0)
43+
- GoogleAdsOnDeviceConversion (3.0.0):
44+
- GoogleUtilities/Environment (~> 8.1)
4445
- GoogleUtilities/Logger (~> 8.1)
4546
- GoogleUtilities/Network (~> 8.1)
4647
- nanopb (~> 3.30910.0)
47-
- GoogleAppMeasurement/Core (12.1.0):
48+
- GoogleAppMeasurement/Core (12.3.0):
4849
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4950
- GoogleUtilities/MethodSwizzler (~> 8.1)
5051
- GoogleUtilities/Network (~> 8.1)
5152
- "GoogleUtilities/NSData+zlib (~> 8.1)"
5253
- nanopb (~> 3.30910.0)
53-
- GoogleAppMeasurement/Default (12.1.0):
54-
- GoogleAdsOnDeviceConversion (= 2.2.0)
55-
- GoogleAppMeasurement/Core (= 12.1.0)
56-
- GoogleAppMeasurement/IdentitySupport (= 12.1.0)
54+
- GoogleAppMeasurement/Default (12.3.0):
55+
- GoogleAdsOnDeviceConversion (~> 3.0.0)
56+
- GoogleAppMeasurement/Core (= 12.3.0)
57+
- GoogleAppMeasurement/IdentitySupport (= 12.3.0)
5758
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5859
- GoogleUtilities/MethodSwizzler (~> 8.1)
5960
- GoogleUtilities/Network (~> 8.1)
6061
- "GoogleUtilities/NSData+zlib (~> 8.1)"
6162
- nanopb (~> 3.30910.0)
62-
- GoogleAppMeasurement/IdentitySupport (12.1.0):
63-
- GoogleAppMeasurement/Core (= 12.1.0)
63+
- GoogleAppMeasurement/IdentitySupport (12.3.0):
64+
- GoogleAppMeasurement/Core (= 12.3.0)
6465
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
6566
- GoogleUtilities/MethodSwizzler (~> 8.1)
6667
- GoogleUtilities/Network (~> 8.1)
@@ -121,16 +122,16 @@ SPEC REPOS:
121122
- PromisesObjC
122123

123124
SPEC CHECKSUMS:
124-
FirebaseABTesting: dfac26fef831cb16c35aa2df8bf5990ddada81d9
125-
FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624
126-
FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090
127-
FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee
128-
FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779
129-
FirebaseRemoteConfig: d4b28137ecdf1d92ddeb886066074eb3936736a7
130-
FirebaseRemoteConfigInterop: a30ffe29b80e3aec9580a44ec9deb7e19e08e6e8
131-
FirebaseSharedSwift: ee4344de8a4d5b5290de3600667307a44f85fd40
132-
GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215
133-
GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca
125+
FirebaseABTesting: 6e748dfecb81a49539c030adb5b12263acf62865
126+
FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae
127+
FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8
128+
FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf
129+
FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5
130+
FirebaseRemoteConfig: 4f4785cfc62e3e3b2f3715d1b7e41ade5ac0419e
131+
FirebaseRemoteConfigInterop: 66d61ad6cee1cd2137cb8dedf468112e9ba92c6a
132+
FirebaseSharedSwift: a08758c5e2617f3ebb47865b45ecca6f02cd35ea
133+
GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261
134+
GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e
134135
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
135136
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
136137
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47

‎analytics/LegacyAnalyticsQuickstart/Podfile.lock‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,55 @@
11
PODS:
2-
- FirebaseAnalytics (12.1.0):
3-
- FirebaseAnalytics/Default (= 12.1.0)
4-
- FirebaseCore (~> 12.1.0)
5-
- FirebaseInstallations (~> 12.1.0)
2+
- FirebaseAnalytics (12.3.0):
3+
- FirebaseAnalytics/Default (= 12.3.0)
4+
- FirebaseCore (~> 12.3.0)
5+
- FirebaseInstallations (~> 12.3.0)
66
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
77
- GoogleUtilities/MethodSwizzler (~> 8.1)
88
- GoogleUtilities/Network (~> 8.1)
99
- "GoogleUtilities/NSData+zlib (~> 8.1)"
1010
- nanopb (~> 3.30910.0)
11-
- FirebaseAnalytics/Default (12.1.0):
12-
- FirebaseCore (~> 12.1.0)
13-
- FirebaseInstallations (~> 12.1.0)
14-
- GoogleAppMeasurement/Default (= 12.1.0)
11+
- FirebaseAnalytics/Default (12.3.0):
12+
- FirebaseCore (~> 12.3.0)
13+
- FirebaseInstallations (~> 12.3.0)
14+
- GoogleAppMeasurement/Default (= 12.3.0)
1515
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
1616
- GoogleUtilities/MethodSwizzler (~> 8.1)
1717
- GoogleUtilities/Network (~> 8.1)
1818
- "GoogleUtilities/NSData+zlib (~> 8.1)"
1919
- nanopb (~> 3.30910.0)
20-
- FirebaseCore (12.1.0):
21-
- FirebaseCoreInternal (~> 12.1.0)
20+
- FirebaseCore (12.3.0):
21+
- FirebaseCoreInternal (~> 12.3.0)
2222
- GoogleUtilities/Environment (~> 8.1)
2323
- GoogleUtilities/Logger (~> 8.1)
24-
- FirebaseCoreInternal (12.1.0):
24+
- FirebaseCoreInternal (12.3.0):
2525
- "GoogleUtilities/NSData+zlib (~> 8.1)"
26-
- FirebaseInstallations (12.1.0):
27-
- FirebaseCore (~> 12.1.0)
26+
- FirebaseInstallations (12.3.0):
27+
- FirebaseCore (~> 12.3.0)
2828
- GoogleUtilities/Environment (~> 8.1)
2929
- GoogleUtilities/UserDefaults (~> 8.1)
3030
- PromisesObjC (~> 2.4)
31-
- GoogleAdsOnDeviceConversion (2.2.0):
31+
- GoogleAdsOnDeviceConversion (3.0.0):
32+
- GoogleUtilities/Environment (~> 8.1)
3233
- GoogleUtilities/Logger (~> 8.1)
3334
- GoogleUtilities/Network (~> 8.1)
3435
- nanopb (~> 3.30910.0)
35-
- GoogleAppMeasurement/Core (12.1.0):
36+
- GoogleAppMeasurement/Core (12.3.0):
3637
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
3738
- GoogleUtilities/MethodSwizzler (~> 8.1)
3839
- GoogleUtilities/Network (~> 8.1)
3940
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4041
- nanopb (~> 3.30910.0)
41-
- GoogleAppMeasurement/Default (12.1.0):
42-
- GoogleAdsOnDeviceConversion (= 2.2.0)
43-
- GoogleAppMeasurement/Core (= 12.1.0)
44-
- GoogleAppMeasurement/IdentitySupport (= 12.1.0)
42+
- GoogleAppMeasurement/Default (12.3.0):
43+
- GoogleAdsOnDeviceConversion (~> 3.0.0)
44+
- GoogleAppMeasurement/Core (= 12.3.0)
45+
- GoogleAppMeasurement/IdentitySupport (= 12.3.0)
4546
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4647
- GoogleUtilities/MethodSwizzler (~> 8.1)
4748
- GoogleUtilities/Network (~> 8.1)
4849
- "GoogleUtilities/NSData+zlib (~> 8.1)"
4950
- nanopb (~> 3.30910.0)
50-
- GoogleAppMeasurement/IdentitySupport (12.1.0):
51-
- GoogleAppMeasurement/Core (= 12.1.0)
51+
- GoogleAppMeasurement/IdentitySupport (12.3.0):
52+
- GoogleAppMeasurement/Core (= 12.3.0)
5253
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
5354
- GoogleUtilities/MethodSwizzler (~> 8.1)
5455
- GoogleUtilities/Network (~> 8.1)
@@ -104,12 +105,12 @@ SPEC REPOS:
104105
- PromisesObjC
105106

106107
SPEC CHECKSUMS:
107-
FirebaseAnalytics: e89a37004bce8789cb53f4cb3e80160d925e6624
108-
FirebaseCore: 5a452ffa66f37c8e281076996837626c5d08c090
109-
FirebaseCoreInternal: ff526c22671bb564d1b34a47615e29ba99389dee
110-
FirebaseInstallations: 6836550c466a6c3f753a777bec6f4e58ea228779
111-
GoogleAdsOnDeviceConversion: b225b50f2ee6bbf856fd51a26684929b32657215
112-
GoogleAppMeasurement: 61605c4152a142d797383a713ecfa5df98fe46ca
108+
FirebaseAnalytics: fefb765365c6d3a4f2cb9d2c99dcf595124d41ae
109+
FirebaseCore: ff47fe1ad3ab9ef66edd3e8bc4647b493d2067f8
110+
FirebaseCoreInternal: a9e1ff270f217489d9258563b693d11a312903bf
111+
FirebaseInstallations: ca48ec60ea51b66b9f214a91847ea3720cde97f5
112+
GoogleAdsOnDeviceConversion: b4fcc557983271d53177d75ddf704c025791d261
113+
GoogleAppMeasurement: 9074f50943fe26a7829be3a2b0043270ad935b9e
113114
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
114115
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
115116
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47

0 commit comments

Comments
 (0)