Skip to content

Commit a0b811f

Browse files
committed
Merge remote-tracking branch 'origin/main' into JesusRojass/#14273
2 parents f17995d + 541ac34 commit a0b811f

File tree

3 files changed

+178
-127
lines changed

3 files changed

+178
-127
lines changed

.github/workflows/common_cocoapods.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@ on:
7575
required: false
7676
default: true
7777

78+
# Whether to lint with `--verbose`. Defaults to false.
79+
verbose:
80+
type: boolean
81+
required: false
82+
default: false
83+
7884
# Whether to additionally build with Swift 6. Defaults to false.
7985
supports_swift6:
8086
type: boolean
@@ -151,6 +157,7 @@ jobs:
151157
command: |
152158
scripts/pod_lib_lint.rb ${{ inputs.product }}.podspec --platforms=${{ matrix.platform }} \
153159
${{ inputs.allow_warnings == true && '--allow-warnings' || '' }} \
160+
${{ inputs.verbose == true && '--verbose' || '' }} \
154161
${{ inputs.analyze == false && '--no-analyze' || '' }} \
155162
${{ inputs.test_specs != '' && format('--test-specs={0}', inputs.test_specs) || '' }} \
156163
${{ (contains(inputs.buildonly_platforms, matrix.platform) || contains(inputs.buildonly_platforms, 'all')) && '--skip-tests' || '' }}

FirebaseAI/Sources/AILog.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ enum AILog {
7474
case liveSessionFailedToSendClientMessage = 3023
7575
case liveSessionUnexpectedResponse = 3024
7676
case liveSessionGoingAwaySoon = 3025
77-
case decodedMissingProtoDurationSuffix = 3026
78-
case decodedInvalidProtoDurationString = 3027
79-
case decodedInvalidProtoDurationSeconds = 3028
80-
case decodedInvalidProtoDurationNanoseconds = 3029
77+
case liveSessionClosedDuringSetup = 3026
78+
case decodedMissingProtoDurationSuffix = 3027
79+
case decodedInvalidProtoDurationString = 3028
80+
case decodedInvalidProtoDurationSeconds = 3029
81+
case decodedInvalidProtoDurationNanoseconds = 3030
8182

8283
// SDK State Errors
8384
case generateContentResponseNoCandidates = 4000

0 commit comments

Comments
 (0)