Skip to content

Commit 65af1d2

Browse files
committed
Merge branch 'main' into ah/ai-logic-rename
# Conflicts: # FirebaseAI.podspec
2 parents 8cc0df4 + 881611e commit 65af1d2

File tree

168 files changed

+447
-398
lines changed

Some content is hidden

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

168 files changed

+447
-398
lines changed

.github/workflows/auth.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ jobs:
112112

113113
# env:
114114
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
115-
# signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
116115
# runs-on: macos-14
117116
# steps:
118117
# - uses: actions/checkout@v4
@@ -135,12 +134,12 @@ jobs:
135134
# test_type: "xctest"
136135

137136
auth-cron-only:
138-
needs: pod_lib_lint
139-
uses: ./.github/workflows/common_cocoapods_cron.yml
140-
with:
141-
product: FirebaseAuth
142-
platforms: '[ "ios", "tvos --skip-tests", "macos --skip-tests", "watchos --skip-tests" ]'
143-
flags: '[ "--use-static-frameworks" ]'
144-
setup_command: scripts/configure_test_keychain.sh
145-
secrets:
146-
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
137+
needs: pod_lib_lint
138+
uses: ./.github/workflows/common_cocoapods_cron.yml
139+
with:
140+
product: FirebaseAuth
141+
platforms: '[ "ios", "tvos --skip-tests", "macos --skip-tests", "watchos --skip-tests" ]'
142+
flags: '[ "--use-static-frameworks" ]'
143+
setup_command: scripts/configure_test_keychain.sh
144+
secrets:
145+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

.github/workflows/common.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ jobs:
9595
- os: macos-14
9696
xcode: Xcode_16.2
9797
platform: iOS
98+
- os: macos-26
99+
xcode: Xcode_26.0
100+
platform: iOS
98101
runs-on: ${{ matrix.os }}
99102
steps:
100103
- uses: actions/checkout@v4

.github/workflows/common_cocoapods.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ on:
104104
required: false
105105
default: ""
106106

107+
# The timeout (in minutes) for the linting to complete. Defaults to 15.
108+
timeout_minutes:
109+
type: number
110+
required: false
111+
default: 15
112+
107113
jobs:
108114
pod-lib-lint:
109115
# Run on the main repo's scheduled jobs or pull requests and manual workflow invocations.
@@ -139,7 +145,7 @@ jobs:
139145
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
140146
if: contains(join(inputs.platforms), matrix.platform) || matrix.os == 'macos-14'
141147
with:
142-
timeout_minutes: 15
148+
timeout_minutes: ${{ inputs.timeout_minutes }}
143149
max_attempts: 3
144150
retry_wait_seconds: 120
145151
command: |

.github/workflows/common_cocoapods_cron.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,14 @@ on:
4646
required: false
4747
default: "macos-15"
4848

49+
env:
50+
FIREBASE_CI: true
51+
4952
jobs:
5053
cron-job:
51-
# This job is intended to be run on a schedule, on the main repo.
52-
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
53-
54+
if: |
55+
github.repository == 'firebase/firebase-ios-sdk' &&
56+
(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
5457
runs-on: ${{ inputs.runs_on }}
5558
strategy:
5659
matrix:

.github/workflows/firebaseai.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ jobs:
4040
include:
4141
- os: macos-15
4242
xcode: Xcode_16.4
43+
- os: macos-26
44+
xcode: Xcode_26.0
4345
runs-on: ${{ matrix.os }}
4446
needs: spm
4547
env:
@@ -87,6 +89,8 @@ jobs:
8789
include:
8890
- os: macos-15
8991
xcode: Xcode_16.4
92+
- os: macos-26
93+
xcode: Xcode_26.0
9094
runs-on: ${{ matrix.os }}
9195
env:
9296
BRANCH_NAME: ${{ github.head_ref || github.ref_name || 'main' }}

.github/workflows/firestore.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ jobs:
397397
platforms: iOS
398398
allow_warnings: true
399399
analyze: false # TODO(#9565, b/227461966): Remove when absl is fixed.
400+
timeout_minutes: 30
400401

401402
# `pod lib lint` takes a long time so only run the other platforms and static frameworks build in the cron.
402403
pod-lib-lint-cron:

Crashlytics/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Unreleased
1+
# 12.3.0
22
- [fixed] Add missing nanopb dependency to fix SwiftPM builds when building
33
dynamically linked libraries. (#15276)
44

Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ __BEGIN_DECLS
3131
#define FIRCLSUUIDStringLength (33)
3232

3333
typedef struct {
34-
_Atomic(void*) volatile baseAddress;
34+
_Atomic(void *) volatile baseAddress;
3535
uint64_t size;
3636
#if CLS_DWARF_UNWINDING_SUPPORTED
37-
const void* ehFrame;
37+
const void *ehFrame;
3838
#endif
3939
#if CLS_COMPACT_UNWINDING_SUPPORTED
40-
const void* unwindInfo;
40+
const void *unwindInfo;
4141
#endif
42-
const void* crashInfo;
42+
const void *crashInfo;
4343
#if CLS_BINARY_IMAGE_RUNTIME_NODE_RECORD_NAME
4444
char name[CLS_BINARY_IMAGE_RUNTIME_NODE_NAME_SIZE];
4545
#endif
@@ -56,7 +56,7 @@ typedef struct {
5656
} FIRCLSBinaryImageDetails;
5757

5858
typedef struct {
59-
const char* path;
59+
const char *path;
6060
} FIRCLSBinaryImageReadOnlyContext;
6161

6262
typedef struct {
@@ -68,13 +68,13 @@ void FIRCLSBinaryImageInit(void);
6868

6969
#if CLS_COMPACT_UNWINDING_SUPPORTED
7070
bool FIRCLSBinaryImageSafeFindImageForAddress(uintptr_t address,
71-
FIRCLSBinaryImageRuntimeNode* image);
72-
bool FIRCLSBinaryImageSafeHasUnwindInfo(FIRCLSBinaryImageRuntimeNode* image);
71+
FIRCLSBinaryImageRuntimeNode *image);
72+
bool FIRCLSBinaryImageSafeHasUnwindInfo(FIRCLSBinaryImageRuntimeNode *image);
7373
#endif
7474

75-
bool FIRCLSBinaryImageFindImageForUUID(const char* uuidString,
76-
FIRCLSBinaryImageDetails* imageDetails);
75+
bool FIRCLSBinaryImageFindImageForUUID(const char *uuidString,
76+
FIRCLSBinaryImageDetails *imageDetails);
7777

78-
bool FIRCLSBinaryImageRecordMainExecutable(FIRCLSFile* file);
78+
bool FIRCLSBinaryImageRecordMainExecutable(FIRCLSFile *file);
7979

8080
__END_DECLS

Crashlytics/Crashlytics/Components/FIRCLSHost.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
2121

2222
typedef struct {
23-
const char* documentDirectoryPath;
23+
const char *documentDirectoryPath;
2424
vm_size_t pageSize;
2525
} FIRCLSHostReadOnlyContext;
2626

2727
__BEGIN_DECLS
2828

29-
void FIRCLSHostInitialize(FIRCLSHostReadOnlyContext* roContext);
29+
void FIRCLSHostInitialize(FIRCLSHostReadOnlyContext *roContext);
3030

3131
vm_size_t FIRCLSHostGetPageSize(void);
3232

33-
bool FIRCLSHostRecord(FIRCLSFile* file);
33+
bool FIRCLSHostRecord(FIRCLSFile *file);
3434

35-
void FIRCLSHostWriteDiskUsage(FIRCLSFile* file);
35+
void FIRCLSHostWriteDiskUsage(FIRCLSFile *file);
3636

3737
bool FIRCLSHostIsRosettaTranslated(void);
3838

Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
__BEGIN_DECLS
2222

23-
void FIRCLSHandler(FIRCLSFile* file,
23+
void FIRCLSHandler(FIRCLSFile *file,
2424
thread_t crashedThread,
25-
void* uapVoid,
25+
void *uapVoid,
2626
bool shouldSuspendThread);
2727

2828
__END_DECLS

0 commit comments

Comments
 (0)