Skip to content

Commit 8d25c9a

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/smoke-tests/src/androidTest/backend/functions/functions/tootallnate/once-2.0.1
2 parents d845042 + 217bd35 commit 8d25c9a

58 files changed

Lines changed: 2648 additions & 343 deletions

File tree

Some content is hidden

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

.github/workflows/app-distribution-gradle-compatibility-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: App Distribution Gradle Compatibility Tests
22

33
on:
44
schedule:
5-
- cron: '0 6 * * *' # Run daily at 6 AM
5+
- cron: '0 6 * * *' # Run daily at 6:00 am UTC
66
pull_request:
77
paths:
88
- 'firebase-appdistribution/**'
@@ -55,11 +55,11 @@ jobs:
5555
path: firebase-appdistribution-gradle/build/reports/tests/
5656

5757
- name: Create GitHub Issue on Failure
58-
if: failure() && (github.event_name == 'schedule')
58+
if: failure()
5959
env:
6060
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6161
run: |
6262
gh issue create \
6363
--title "[firebase-appdistribution] Gradle Compatibility Tests Failed" \
6464
--body "The daily compatibility tests failed on the main branch. Please check the workflow logs here to diagnose the failure: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
65-
--label "bug,ci-failure,api: appdistribution"
65+
--label "api: appdistribution"

.github/workflows/dataconnect.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ on:
3434
env:
3535
FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
3636
FDC_ANDROID_EMULATOR_API_LEVEL: ${{ inputs.androidEmulatorApiLevel || '34' }}
37-
FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '20' }}
37+
FDC_NODEJS_VERSION: ${{ inputs.nodeJsVersion || '24' }}
3838
FDC_INPUT_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion }}
3939
FDC_FIREBASE_TOOLS_DIR: /tmp/firebase-tools
4040
FDC_FIREBASE_COMMAND: /tmp/firebase-tools/node_modules/.bin/firebase
@@ -413,6 +413,7 @@ jobs:
413413
needs:
414414
- 'integration-test'
415415
- 'actionlint-dataconnect-yml'
416+
- 'zshellcheck'
416417
- 'python-ci-unit-tests'
417418
- 'python-ci-lint'
418419
- 'python-ci-format'
@@ -438,6 +439,7 @@ jobs:
438439
cat >'${{ runner.temp }}/job_results.txt' <<EOF
439440
integration-test:${{ needs.integration-test.result }}
440441
actionlint-dataconnect-yml:${{ needs.actionlint-dataconnect-yml.result }}
442+
zshellcheck:${{ needs.zshellcheck.result }}
441443
python-ci-unit-tests:${{ needs.python-ci-unit-tests.result }}
442444
python-ci-lint:${{ needs.python-ci-lint.result }}
443445
python-ci-format:${{ needs.python-ci-format.result }}

.github/workflows/dataconnect_demo_app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
- cron: '0 11 * * *' # Run nightly at 11am UTC (3am Pacific, 6am Eastern)
2121

2222
env:
23-
FDC_NODE_VERSION: ${{ inputs.nodeVersion || '20' }}
23+
FDC_NODE_VERSION: ${{ inputs.nodeVersion || '24' }}
2424
FDC_INPUT_FIREBASE_TOOLS_VERSION: ${{ inputs.firebaseToolsVersion }}
2525
FDC_JAVA_VERSION: ${{ inputs.javaVersion || '17' }}
2626
FDC_FIREBASE_TOOLS_DIR: ${{ github.workspace }}/firebase-tools

ai-logic/firebase-ai/src/androidTest/kotlin/com/google/firebase/ai/AIModels.kt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ class AIModels {
2828
var app: FirebaseApp? = null
2929
lateinit var vertexAIFlashModel: GenerativeModel
3030
lateinit var vertexAIFlashLiteModel: GenerativeModel
31+
lateinit var vertexAI3_5FlashModel: GenerativeModel
3132
lateinit var googleAIFlashModel: GenerativeModel
3233
lateinit var googleAIFlashLiteModel: GenerativeModel
34+
lateinit var googleAI3_5FlashModel: GenerativeModel
3335
lateinit var vertexAITemplateModel: TemplateGenerativeModel
3436
lateinit var googleAITemplateModel: TemplateGenerativeModel
3537

@@ -41,8 +43,10 @@ class AIModels {
4143
return listOf(
4244
vertexAIFlashModel,
4345
vertexAIFlashLiteModel,
46+
vertexAI3_5FlashModel,
4447
googleAIFlashModel,
45-
googleAIFlashLiteModel
48+
googleAIFlashLiteModel,
49+
googleAI3_5FlashModel,
4650
)
4751
}
4852

@@ -66,6 +70,11 @@ class AIModels {
6670
.generativeModel(
6771
modelName = "gemini-2.5-flash-lite",
6872
)
73+
vertexAI3_5FlashModel =
74+
FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI("global"))
75+
.generativeModel(
76+
modelName = "gemini-3.5-flash",
77+
)
6978
googleAIFlashModel =
7079
FirebaseAI.getInstance(app!!, GenerativeBackend.googleAI())
7180
.generativeModel(
@@ -76,6 +85,11 @@ class AIModels {
7685
.generativeModel(
7786
modelName = "gemini-2.5-flash-lite",
7887
)
88+
googleAI3_5FlashModel =
89+
FirebaseAI.getInstance(app!!, GenerativeBackend.googleAI())
90+
.generativeModel(
91+
modelName = "gemini-3.5-flash",
92+
)
7993
vertexAITemplateModel =
8094
FirebaseAI.getInstance(app!!, GenerativeBackend.vertexAI()).templateGenerativeModel()
8195
googleAITemplateModel =

appcheck/firebase-appcheck-debug-testing/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Unreleased
22

3+
- [unchanged] Updated to keep [app_check] SDK versions aligned.
4+
35
# 19.0.2
46

57
- [unchanged] Updated to keep [app_check] SDK versions aligned.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=19.0.3
1+
version=19.1.0
22
latestReleasedVersion=19.0.2

appcheck/firebase-appcheck-debug/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Unreleased
22

3+
- [fixed] Fixed issue preventing limited use tokens from being correctly generated. (#8204)
4+
35
# 19.0.2
46

57
- [unchanged] Updated to keep [app_check] SDK versions aligned.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=19.0.3
1+
version=19.1.0
22
latestReleasedVersion=19.0.2

appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/internal/DebugAppCheckProvider.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,22 @@ static Task<String> determineDebugSecret(
110110
@NonNull
111111
@Override
112112
public Task<AppCheckToken> getToken() {
113+
return getToken(/* isLimitedUseToken= */ false);
114+
}
115+
116+
@NonNull
117+
@Override
118+
public Task<AppCheckToken> getLimitedUseToken() {
119+
return getToken(/* isLimitedUseToken= */ true);
120+
}
121+
122+
private Task<AppCheckToken> getToken(boolean isLimitedUseToken) {
113123
return debugSecretTask
114124
.onSuccessTask(
115125
liteExecutor,
116126
debugSecret -> {
117-
ExchangeDebugTokenRequest request = new ExchangeDebugTokenRequest(debugSecret);
127+
ExchangeDebugTokenRequest request =
128+
new ExchangeDebugTokenRequest(debugSecret, isLimitedUseToken);
118129
return Tasks.call(
119130
blockingExecutor,
120131
() ->

appcheck/firebase-appcheck-debug/src/main/java/com/google/firebase/appcheck/debug/internal/ExchangeDebugTokenRequest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,23 @@
2525
*/
2626
public class ExchangeDebugTokenRequest {
2727
@VisibleForTesting static final String DEBUG_TOKEN_KEY = "debugToken";
28+
@VisibleForTesting static final String LIMITED_USE_TOKEN_KEY = "limited_use";
2829

2930
private final String debugToken;
31+
private final boolean isLimitedUseToken;
3032

31-
public ExchangeDebugTokenRequest(@NonNull String debugToken) {
33+
public ExchangeDebugTokenRequest(@NonNull String debugToken, boolean isLimitedUseToken) {
3234
this.debugToken = debugToken;
35+
this.isLimitedUseToken = isLimitedUseToken;
3336
}
3437

3538
@NonNull
3639
public String toJsonString() throws JSONException {
3740
JSONObject jsonObject = new JSONObject();
3841
jsonObject.put(DEBUG_TOKEN_KEY, debugToken);
39-
42+
if (isLimitedUseToken) {
43+
jsonObject.put(LIMITED_USE_TOKEN_KEY, true);
44+
}
4045
return jsonObject.toString();
4146
}
4247
}

0 commit comments

Comments
 (0)