Skip to content

Commit 7b7214c

Browse files
andrewheardandrewheard
committed
Merge remote-tracking branch 'origin/main' into ah/zip-macos-15
2 parents 84f15f1 + 0aca0bf commit 7b7214c

File tree

9 files changed

+61
-47
lines changed

9 files changed

+61
-47
lines changed

‎.github/workflows/core_extension.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@ jobs:
2020
strategy:
2121
matrix:
2222
target: [ios, tvos, macos, watchos]
23-
os: [macos-14]
24-
xcode: [Xcode_15.2, Xcode_16]
25-
runs-on: ${{ matrix.os }}
23+
build-env:
24+
- os: macos-14
25+
xcode: Xcode_15.2
26+
- os: macos-15
27+
xcode: Xcode_16.1
28+
runs-on: ${{ matrix.build-env.os }}
2629
steps:
2730
- uses: actions/checkout@v4
2831
- uses: ruby/setup-ruby@v1
2932
- name: Setup Bundler
3033
run: scripts/setup_bundler.sh
3134
- name: Xcode
32-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
35+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3336
- name: Build and test
3437
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreExtension.podspec --platforms=${{ matrix.target }}
3538

‎.github/workflows/database.yml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,19 @@ jobs:
2626
strategy:
2727
matrix:
2828
target: [ios, tvos, macos --skip-tests, watchos]
29-
os: [macos-14]
30-
xcode: [Xcode_15.2, Xcode_16]
31-
runs-on: ${{ matrix.os }}
29+
build-env:
30+
- os: macos-14
31+
xcode: Xcode_15.2
32+
- os: macos-15
33+
xcode: Xcode_16.1
34+
runs-on: ${{ matrix.build-env.os }}
3235
steps:
3336
- uses: actions/checkout@v4
3437
- uses: ruby/setup-ruby@v1
3538
- name: Setup Bundler
3639
run: scripts/setup_bundler.sh
3740
- name: Xcode
38-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
41+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3942
- name: Build and test
4043
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseDatabase.podspec --test-specs=unit --platforms=${{ matrix.target }}
4144

@@ -96,22 +99,22 @@ jobs:
9699
xcode: Xcode_15.4
97100
target: iOS
98101
- os: macos-15
99-
xcode: Xcode_16
102+
xcode: Xcode_16.1
100103
target: iOS
101104
- os: macos-15
102-
xcode: Xcode_16
105+
xcode: Xcode_16.1
103106
target: tvOS
104107
- os: macos-15
105-
xcode: Xcode_16
108+
xcode: Xcode_16.1
106109
target: macOS
107110
- os: macos-15
108-
xcode: Xcode_16
111+
xcode: Xcode_16.1
109112
target: watchOS
110113
- os: macos-15
111-
xcode: Xcode_16
114+
xcode: Xcode_16.1
112115
target: catalyst
113116
- os: macos-15
114-
xcode: Xcode_16
117+
xcode: Xcode_16.1
115118
target: visionOS
116119
runs-on: ${{ matrix.os }}
117120
steps:

‎.github/workflows/firebase_app_check.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ jobs:
2222
matrix:
2323
podspec: [FirebaseAppCheckInterop.podspec, FirebaseAppCheck.podspec]
2424
target: [ios, tvos, macos --skip-tests, watchos]
25-
os: [macos-14]
26-
xcode: [Xcode_15.2, Xcode_16]
27-
runs-on: ${{ matrix.os }}
25+
build-env:
26+
- os: macos-14
27+
xcode: Xcode_15.2
28+
- os: macos-15
29+
xcode: Xcode_16.1
30+
runs-on: ${{ matrix.build-env.os }}
2831
steps:
2932
- uses: actions/checkout@v4
3033
- uses: ruby/setup-ruby@v1
@@ -33,7 +36,7 @@ jobs:
3336
- name: Configure test keychain
3437
run: scripts/configure_test_keychain.sh
3538
- name: Xcode
36-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
39+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3740
- name: FirebaseAppCheck
3841
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }}
3942

‎.github/workflows/functions.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ jobs:
3030
strategy:
3131
matrix:
3232
target: [ios, tvos, macos, watchos]
33-
os: [macos-14]
34-
xcode: [Xcode_15.2, Xcode_16]
33+
include:
34+
- os: macos-14
35+
xcode: Xcode_15.2
36+
- os: macos-15
37+
xcode: Xcode_16.1
3538
runs-on: ${{ matrix.os }}
3639
steps:
3740
- uses: actions/checkout@v4
@@ -116,22 +119,22 @@ jobs:
116119
xcode: Xcode_15.4
117120
target: iOS
118121
- os: macos-15
119-
xcode: Xcode_16
122+
xcode: Xcode_16.1
120123
target: iOS
121124
- os: macos-15
122-
xcode: Xcode_16
125+
xcode: Xcode_16.1
123126
target: tvOS
124127
- os: macos-15
125-
xcode: Xcode_16
128+
xcode: Xcode_16.1
126129
target: macOS
127130
- os: macos-15
128-
xcode: Xcode_16
131+
xcode: Xcode_16.1
129132
target: watchOS
130133
- os: macos-15
131-
xcode: Xcode_16
134+
xcode: Xcode_16.1
132135
target: catalyst
133136
- os: macos-15
134-
xcode: Xcode_16
137+
xcode: Xcode_16.1
135138
target: visionOS
136139
runs-on: ${{ matrix.os }}
137140
steps:

‎.github/workflows/storage.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
language: [Swift, ObjC]
2626
include:
2727
- os: macos-15
28-
xcode: Xcode_16
28+
xcode: Xcode_16.1
2929
env:
3030
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
3131
runs-on: ${{ matrix.os }}
@@ -96,22 +96,22 @@ jobs:
9696
xcode: Xcode_15.4
9797
target: iOS
9898
- os: macos-15
99-
xcode: Xcode_16
99+
xcode: Xcode_16.1
100100
target: iOS
101101
- os: macos-15
102-
xcode: Xcode_16
102+
xcode: Xcode_16.1
103103
target: tvOS
104104
- os: macos-15
105-
xcode: Xcode_16
105+
xcode: Xcode_16.1
106106
target: macOS
107107
- os: macos-15
108-
xcode: Xcode_16
108+
xcode: Xcode_16.1
109109
target: watchOS
110110
- os: macos-15
111-
xcode: Xcode_16
111+
xcode: Xcode_16.1
112112
target: catalyst
113113
- os: macos-15
114-
xcode: Xcode_16
114+
xcode: Xcode_16.1
115115
target: visionOS
116116
runs-on: ${{ matrix.os }}
117117
steps:
@@ -200,8 +200,8 @@ jobs:
200200
- os: macos-14
201201
xcode: Xcode_15.3
202202
tests: --skip-tests
203-
- os: macos-14
204-
xcode: Xcode_16
203+
- os: macos-15
204+
xcode: Xcode_16.1
205205
tests: --test-specs=unit
206206
runs-on: ${{ matrix.os }}
207207
steps:
@@ -224,12 +224,12 @@ jobs:
224224
strategy:
225225
matrix:
226226
target: [ios, tvos, macos, watchos]
227-
os: [macos-14]
227+
os: [macos-14, macos-15]
228228
include:
229229
- os: macos-14
230230
xcode: Xcode_15.3
231-
- os: macos-14
232-
xcode: Xcode_16
231+
- os: macos-15
232+
xcode: Xcode_16.1
233233
runs-on: ${{ matrix.os }}
234234
needs: pod-lib-lint
235235
steps:

‎FirebasePerformance/Sources/Instrumentation/UIKit/FPRUIViewControllerInstrument.m‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,9 @@ void InstrumentViewDidAppear(FPRUIViewControllerInstrument *instrument,
6969

7070
// This has to be called on the main thread and so it's done here instead of in
7171
// FPRScreenTraceTracker.
72-
// TODO(#13067): Replace keyWindow usage (deprecated in iOS and unavailable in visionOS).
73-
#if !defined(TARGET_OS_VISION) || !TARGET_OS_VISION
74-
#pragma clang diagnostic push
75-
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
76-
if ([((UIViewController *)_self).view isDescendantOfView:FPRSharedApplication().keyWindow]) {
77-
#pragma clang diagnostic pop
72+
if (FPRSharedApplication() && ((UIViewController *)_self).view.window.keyWindow) {
7873
[[FPRScreenTraceTracker sharedInstance] viewControllerDidAppear:_self];
7974
}
80-
#endif
8175
}];
8276
}
8377

‎FirebaseVertexAI/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Unreleased
2+
- [changed] The token counts from `GenerativeModel.countTokens(...)` now include
3+
tokens from the schema for JSON output and function calling; reported token
4+
counts will now be higher if using these features.
5+
16
# 11.5.0
27
- [fixed] Fixed an issue where `VertexAI.vertexAI(app: app1)` and
38
`VertexAI.vertexAI(app: app2)` would return the same instance if their

‎FirebaseVertexAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ final class IntegrationTests: XCTestCase {
217217

218218
let response = try await model.countTokens(prompt)
219219

220-
XCTAssertEqual(response.totalTokens, 34)
221-
XCTAssertEqual(response.totalBillableCharacters, 59)
220+
XCTAssertEqual(response.totalTokens, 58)
221+
XCTAssertEqual(response.totalBillableCharacters, 160)
222222
}
223223

224224
func testCountTokens_appCheckNotConfigured_shouldFail() async throws {

‎scripts/style.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ s%^./%%
153153
# Generated source
154154
\%/Firestore/core/src/util/config.h% d
155155
156+
# Generated Code for Data Connect sample
157+
\%/Examples/FriendlyFlix/app/FriendlyFlixSDK/% d
158+
156159
# Sources pulled in by travis bundler, with and without a leading slash
157160
\%^/?vendor/bundle/% d
158161

0 commit comments

Comments
 (0)