Skip to content

Commit fb6bc82

Browse files
committed
fixes
1 parent 577e151 commit fb6bc82

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

.github/workflows/performance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
performance:
2929
# Don't run on private repo unless it is a PR.
3030
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
31-
runs-on: macos-14
31+
runs-on: macos-12
3232
strategy:
3333
matrix:
3434
target: [iOS, tvOS]

.github/workflows/spm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
include:
3232
# The integration tests are slow and flaky on Xcode 15, so just build.
3333
- os: macos-13
34-
xcode: Xcode_15.3
34+
xcode: Xcode_15.2
3535
test: spmbuildonly
3636
- os: macos-14
3737
xcode: Xcode_15.3

IntegrationTesting/ClientApp/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://github.com/firebase/SpecsStaging.git'
33
source 'https://cdn.cocoapods.org/'
44

55
target 'ClientApp-CocoaPods' do
6-
platform :ios, '11.0'
6+
platform :ios, '12.0'
77

88
use_frameworks!
99

Package.swift

+8-2
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,16 @@ let package = Package(
166166
),
167167
abseilDependency(),
168168
grpcDependency(),
169+
// TODO: restore OCMock when https://github.com/erikdoe/ocmock/pull/537
170+
// gets merged to fix Xcode 15.3 builds.
169171
.package(
170-
url: "https://github.com/erikdoe/ocmock.git",
171-
revision: "c5eeaa6dde7c308a5ce48ae4d4530462dd3a1110"
172+
url: "https://github.com/paulb777/ocmock.git",
173+
revision: "173955e93e6ee6999a10729ab67e4b4efdd1db6d"
172174
),
175+
// .package(
176+
// url: "https://github.com/erikdoe/ocmock.git",
177+
// revision: "c5eeaa6dde7c308a5ce48ae4d4530462dd3a1110"
178+
// ),
173179
.package(
174180
url: "https://github.com/firebase/leveldb.git",
175181
"1.22.2" ..< "1.23.0"

SymbolCollisionTest/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ target 'SymbolCollisionTest' do
4040
# Other Google Pods
4141
pod 'ARCore'
4242
# pod 'Blockly' `Blockly` does not specify a Swift version ...
43-
pod 'DigitsMigrationHelper'
43+
# pod 'DigitsMigrationHelper' Dependency Base64 doesn't build in Xcode 15
4444
pod 'EarlGrey'
4545
# pod 'GeoFire' -- requires Firebase/Database 4.0
4646
# pod 'google-cast-sdk' -- abseil

0 commit comments

Comments
 (0)