Skip to content

Commit abffaed

Browse files
authored
Merge branch 'main' into am-messaging_registration
2 parents 8b50612 + 754d256 commit abffaed

18 files changed

Lines changed: 1 addition & 1628 deletions

File tree

Android/firebase_dependencies.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ def firebaseDependenciesMap = [
3535
'performance' : ['com.google.firebase:firebase-perf'],
3636
'remote_config' : ['com.google.firebase:firebase-config'],
3737
'storage' : ['com.google.firebase:firebase-storage'],
38-
'testlab' : [],
3938
'ump' : ['com.google.android.ump:user-messaging-platform:4.0.0']
4039
]
4140

release_build_files/Android/firebase_dependencies.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ def firebaseDependenciesMap = [
3535
'performance' : ['com.google.firebase:firebase-perf'],
3636
'remote_config' : ['com.google.firebase:firebase-config'],
3737
'storage' : ['com.google.firebase:firebase-storage'],
38-
'testlab' : [],
3938
'ump' : ['com.google.android.ump:user-messaging-platform:4.0.0']
4039
]
4140

@@ -83,9 +82,6 @@ class Dependencies {
8382
def getStorage() {
8483
libSet.add('storage')
8584
}
86-
def getTestlab() {
87-
libSet.add('testlab')
88-
}
8985
def getUmp() {
9086
libSet.add('ump')
9187
}

release_build_files/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ add_firebase_target(firebase_messaging)
102102
add_firebase_target(firebase_performance)
103103
add_firebase_target(firebase_remote_config)
104104
add_firebase_target(firebase_storage)
105-
add_firebase_target(firebase_testlab)
106105
add_firebase_target(firebase_ump)
107106

108107
# Auth on Linux desktop has an additional dependency on libsecret,

scripts/gha/integration_testing/build_testapps.json

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -181,19 +181,6 @@
181181
"firebase.xcframework"
182182
],
183183
"provision": "Google_Development.mobileprovision"
184-
},
185-
{
186-
"name": "test_lab",
187-
"full_name": "FirebaseTestLab",
188-
"bundle_id": "com.google.ios.testlab.testapp",
189-
"ios_target": "integration_test",
190-
"tvos_target": "",
191-
"testapp_path": "testlab/integration_test",
192-
"frameworks": [
193-
"firebase_testlab.xcframework",
194-
"firebase.xcframework"
195-
],
196-
"provision": "Google_Development.mobileprovision"
197184
}
198185
],
199186
"apple_team_id": "REPLACE_ME_TEMP_INVALID_ID",
@@ -250,8 +237,7 @@
250237
"'com.google.firebase:firebase-messaging:[0,)'],",
251238
"'performance' : ['com.google.firebase:firebase-perf:[0,)'],",
252239
"'remote_config' : ['com.google.firebase:firebase-config:[0,)'],",
253-
"'storage' : ['com.google.firebase:firebase-storage:[0,)'],",
254-
"'testlab' : []",
240+
"'storage' : ['com.google.firebase:firebase-storage:[0,)']",
255241
"]"
256242
]
257243
}

testlab/src/android/testlab.cc

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)