Skip to content

Commit 387d4f8

Browse files
allisonbm92schmidt-sebastian
authored andcommitted
Remove move product flavors from smoke tests. (#557)
We originally introduced the product flavors to introduce selective test execution (similar to the check-changed and device-check-changed tasks). However, we're abandoning this in favor of using the smoke tests as build tests. Therefore, we must always build with all dependencies and test cases. This change keeps the `combined' flavor until we can make changes to the test runner.
1 parent 383cbce commit 387d4f8

File tree

9 files changed

+1
-91
lines changed

9 files changed

+1
-91
lines changed

smoke-tests/build.gradle

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,39 +41,12 @@ android {
4141

4242
flavorDimensions "systemUnderTest"
4343

44+
// TODO(allisonbm92): Switch to the default flavor.
4445
productFlavors {
4546
combined {
4647
dimension "systemUnderTest"
4748
applicationId "com.google.firebase.testing.combined"
4849
}
49-
50-
database {
51-
dimension "systemUnderTest"
52-
applicationId "com.google.firebase.testing.database"
53-
}
54-
55-
firestore {
56-
dimension "systemUnderTest"
57-
applicationId "com.google.firebase.testing.firestore"
58-
}
59-
60-
storage {
61-
dimension "systemUnderTest"
62-
applicationId "com.google.firebase.testing.storage"
63-
}
64-
}
65-
66-
sourceSets {
67-
combined {
68-
java.srcDirs = [
69-
"src/combined/java",
70-
"src/database/java",
71-
"src/firestore/java",
72-
"src/functions/java",
73-
"src/remoteConfig/java",
74-
"src/storage/java",
75-
]
76-
}
7750
}
7851
}
7952

@@ -95,18 +68,6 @@ dependencies {
9568
combinedImplementation "com.google.firebase:firebase-functions"
9669
combinedImplementation "com.google.firebase:firebase-config"
9770
combinedImplementation "com.google.firebase:firebase-storage"
98-
99-
// Database
100-
databaseImplementation "com.google.firebase:firebase-auth"
101-
databaseImplementation "com.google.firebase:firebase-database"
102-
103-
// Firestore
104-
firestoreImplementation "com.google.firebase:firebase-auth"
105-
firestoreImplementation "com.google.firebase:firebase-firestore"
106-
107-
// Storage
108-
storageImplementation "com.google.firebase:firebase-auth"
109-
storageImplementation "com.google.firebase:firebase-storage"
11071
}
11172

11273
clean.doLast {

smoke-tests/src/database/AndroidManifest.xml

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

smoke-tests/src/firestore/AndroidManifest.xml

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

smoke-tests/src/storage/AndroidManifest.xml

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

0 commit comments

Comments
 (0)