Skip to content

Commit bd9c6a2

Browse files
committed
Merge branch 'nc/auth-swift' into nc/auth-swift6-1
2 parents e17fc96 + 1c82538 commit bd9c6a2

File tree

73 files changed

+719
-485
lines changed

Some content is hidden

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

73 files changed

+719
-485
lines changed

.github/actions/notices_generation/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
fi
4141
shell: bash
4242
- name: Upload artifacts
43-
uses: actions/upload-artifact@v3
43+
uses: actions/upload-artifact@v4
4444
with:
4545
name: notices
4646
path: ${{ inputs.notices-path }}

.github/workflows/health-metrics-presubmit.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
run: scripts/setup_bundler.sh
7676
- name: Build and test
7777
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseABTesting --platform=${{ matrix.target }}
78-
- uses: actions/upload-artifact@v3
78+
- uses: actions/upload-artifact@v4
7979
with:
8080
name: codecoverage
8181
path: /Users/runner/*.xcresult
@@ -95,7 +95,7 @@ jobs:
9595
run: scripts/setup_bundler.sh
9696
- name: Build and test
9797
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseAuth --platform=${{ matrix.target }}
98-
- uses: actions/upload-artifact@v3
98+
- uses: actions/upload-artifact@v4
9999
with:
100100
name: codecoverage
101101
path: /Users/runner/*.xcresult
@@ -120,7 +120,7 @@ jobs:
120120
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseDatabase --platform=${{ matrix.target }}
121121
# TODO: Make sure that https://github.com/actions/upload-artifact/issues/478 is resolved
122122
# before going to actions/upload-artifact@v4.
123-
- uses: actions/upload-artifact@v3
123+
- uses: actions/upload-artifact@v4
124124
with:
125125
name: codecoverage
126126
path: /Users/runner/*.xcresult
@@ -143,7 +143,7 @@ jobs:
143143
run: scripts/setup_bundler.sh
144144
- name: Build and test
145145
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseDynamicLinks --platform=${{ matrix.target }}
146-
- uses: actions/upload-artifact@v3
146+
- uses: actions/upload-artifact@v4
147147
with:
148148
name: codecoverage
149149
path: /Users/runner/*.xcresult
@@ -169,7 +169,7 @@ jobs:
169169
run: |
170170
export EXPERIMENTAL_MODE=true
171171
./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseFirestore --platform=${{ matrix.target }}
172-
- uses: actions/upload-artifact@v3
172+
- uses: actions/upload-artifact@v4
173173
with:
174174
name: codecoverage
175175
path: /Users/runner/*.xcresult
@@ -192,7 +192,7 @@ jobs:
192192
run: scripts/setup_bundler.sh
193193
- name: Build and test
194194
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseFunctions --platform=${{ matrix.target }}
195-
- uses: actions/upload-artifact@v3
195+
- uses: actions/upload-artifact@v4
196196
with:
197197
name: codecoverage
198198
path: /Users/runner/*.xcresult
@@ -215,7 +215,7 @@ jobs:
215215
run: scripts/setup_bundler.sh
216216
- name: Build and test
217217
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseInAppMessaging --platform=${{ matrix.target }}
218-
- uses: actions/upload-artifact@v3
218+
- uses: actions/upload-artifact@v4
219219
with:
220220
name: codecoverage
221221
path: /Users/runner/*.xcresult
@@ -238,7 +238,7 @@ jobs:
238238
run: scripts/setup_bundler.sh
239239
- name: Build and test
240240
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseMessaging --platform=${{ matrix.target }}
241-
- uses: actions/upload-artifact@v3
241+
- uses: actions/upload-artifact@v4
242242
with:
243243
name: codecoverage
244244
path: /Users/runner/*.xcresult
@@ -264,7 +264,7 @@ jobs:
264264
run: gem install xcpretty
265265
- name: Build and test
266266
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebasePerformance --platform=${{ matrix.target }}
267-
- uses: actions/upload-artifact@v3
267+
- uses: actions/upload-artifact@v4
268268
with:
269269
name: codecoverage
270270
path: /Users/runner/*.xcresult
@@ -287,7 +287,7 @@ jobs:
287287
run: scripts/setup_bundler.sh
288288
- name: Build and test
289289
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseRemoteConfig --platform=${{ matrix.target }}
290-
- uses: actions/upload-artifact@v3
290+
- uses: actions/upload-artifact@v4
291291
with:
292292
name: codecoverage
293293
path: /Users/runner/*.xcresult
@@ -310,7 +310,7 @@ jobs:
310310
run: scripts/setup_bundler.sh
311311
- name: Build and test
312312
run: ./scripts/health_metrics/pod_test_code_coverage_report.sh --sdk=FirebaseStorage --platform=${{ matrix.target }}
313-
- uses: actions/upload-artifact@v3
313+
- uses: actions/upload-artifact@v4
314314
with:
315315
name: codecoverage
316316
path: /Users/runner/*.xcresult

.github/workflows/spm.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ concurrency:
2121
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
2222
cancel-in-progress: true
2323

24+
env:
25+
FIREBASE_CI: true
26+
2427
jobs:
2528
spm-package-resolved:
2629
env:

Crashlytics/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
# 11.5.0
2+
- [changed] Updated `upload-symbols` to version 3.19, removed all methods require CFRelease and switch to modern classes (#13420).
3+
14
# 11.4.0
25
- [fixed] Updated `upload-symbols` to version 3.18 with support for uploading multiple DWARF contents in a dSYM bundle (#13543).
6+
- [fixed] Fixed upload-symbols run script argument order (#13965).
37

48
# 10.28.1
59
- [changed] Reverted "Add SIGTERM support (#12881)" (#13117)

Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlytics.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ NS_SWIFT_NAME(Crashlytics)
5959
* Adds logging that is sent with your crash data. The logging does not appear in app
6060
* logs and is only visible in the Crashlytics dashboard.
6161
*
62-
* @param format Format of string
63-
* @param ... A comma-separated list of arguments to substitute into format
62+
* @param format The format of the string, followed by a comma-separated list
63+
* of arguments to substitute into the format.
6464
*/
6565
- (void)logWithFormat:(NSString *)format, ... NS_FORMAT_FUNCTION(1, 2);
6666

Crashlytics/Crashlytics/Public/FirebaseCrashlytics/FIRCrashlyticsReport.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ NS_SWIFT_NAME(CrashlyticsReport)
5656
* Adds logging that is sent with your crash data. The logging does not appear in the
5757
* system.log and is only visible in the Crashlytics dashboard.
5858
*
59-
* @param format Format of string
60-
* @param ... A comma-separated list of arguments to substitute into format
59+
* @param format The format of the string, followed by a comma-separated list
60+
* of arguments to substitute into the format.
6161
*/
6262
- (void)logWithFormat:(NSString *)format, ... NS_FORMAT_FUNCTION(1, 2);
6363

Crashlytics/run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ for i in "$@"; do
4646
ARGUMENTS="$ARGUMENTS \"$i\""
4747
done
4848

49-
VALIDATE_ARGUMENTS="$ARGUMENTS --build-phase --validate"
50-
UPLOAD_ARGUMENTS="$ARGUMENTS --build-phase"
49+
VALIDATE_ARGUMENTS="--build-phase --validate $ARGUMENTS"
50+
UPLOAD_ARGUMENTS="--build-phase $ARGUMENTS "
5151

5252
# Quote the path to handle folders with special characters
5353
COMMAND_PATH="\"$DIR/upload-symbols\" "

Crashlytics/upload-symbols

32 Bytes
Binary file not shown.

FirebaseAuth/Sources/Swift/Auth/Auth.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ extension Auth: AuthInterop {
253253

254254
/// Sets the `currentUser` on the receiver to the provided user object.
255255
/// - Parameter user: The user object to be set as the current user of the calling Auth instance.
256-
/// - Parameter completion: Optionally; a block invoked after the user of the calling Auth
257-
/// instance has been updated or an error was encountered.
258256
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
259257
open func updateCurrentUser(_ user: User) async throws {
260258
return try await withCheckedThrowingContinuation { continuation in
@@ -1431,6 +1429,7 @@ extension Auth: AuthInterop {
14311429
}
14321430

14331431
/// Revoke the users token with authorization code.
1432+
/// - Parameter authorizationCode: The authorization code used to perform the revocation.
14341433
/// - Parameter completion: (Optional) the block invoked when the request to revoke the token is
14351434
/// complete, or fails. Invoked asynchronously on the main thread in the future.
14361435
@objc open func revokeToken(withAuthorizationCode authorizationCode: String,
@@ -1451,8 +1450,7 @@ extension Auth: AuthInterop {
14511450
}
14521451

14531452
/// Revoke the users token with authorization code.
1454-
/// - Parameter completion: (Optional) the block invoked when the request to revoke the token is
1455-
/// complete, or fails. Invoked asynchronously on the main thread in the future.
1453+
/// - Parameter authorizationCode: The authorization code used to perform the revocation.
14561454
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
14571455
open func revokeToken(withAuthorizationCode authorizationCode: String) async throws {
14581456
return try await withCheckedThrowingContinuation { continuation in

FirebaseAuth/Sources/Swift/AuthProvider/FederatedAuthProvider.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import Foundation
2222
/// Used to obtain an auth credential via a mobile web flow.
2323
/// This method is available on iOS only.
2424
/// - Parameter uiDelegate: An optional UI delegate used to present the mobile web flow.
25+
/// - Parameter completionHandler: Optionally; a block which is invoked
26+
/// asynchronously on the main thread when the mobile web flow is
27+
/// completed.
2528
@available(iOS 13, tvOS 13, macOS 10.15, watchOS 8, *)
2629
@objc(getCredentialWithUIDelegate:completion:)
2730
func credential(with uiDelegate: AuthUIDelegate?) async throws -> AuthCredential

0 commit comments

Comments
 (0)