Skip to content

Commit ffc5d33

Browse files
authored
Migrate vendor plugin to new transform api. (#4424)
* Migrate vendor plugin to new transform api. Additionally disable vendoring for the debug variant since unit tests and integ tests don't work when dagger is vendored in, since the dagger compiler enforces that all module and component annotations live under the `dagger` java package, not the vendered package like `com.example.dagger`. * fix classpath * Cleanup manifests, run tests in debug mode on CI * Remove unused manifests. * Add tests that build an app and fail on missing symbols. * Upgrade from rc01 to stable. * remove unused variant config.
1 parent ff558a4 commit ffc5d33

File tree

17 files changed

+269
-378
lines changed

17 files changed

+269
-378
lines changed

appcheck/firebase-appcheck/ktx/src/androidTest/AndroidManifest.xml

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

buildSrc/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ dependencies {
6262
implementation("org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r")
6363

6464
implementation("com.google.code.gson:gson:2.8.9")
65-
implementation("com.android.tools.build:gradle:7.2.2")
66-
implementation("com.android.tools.build:builder-test-api:7.2.2")
65+
implementation("com.android.tools.build:gradle:7.4.0")
66+
implementation("com.android.tools.build:builder-test-api:7.4.0")
6767
implementation("gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9")
6868

6969
testImplementation("junit:junit:4.13.2")

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,6 @@ public void apply(Project project) {
9090
test.systemProperty("javax.net.ssl.trustStoreType", "JKS");
9191
})));
9292

93-
// skip debug tests in CI
94-
// TODO(vkryachko): provide ability for teams to control this if needed
95-
if (System.getenv().containsKey("FIREBASE_CI")) {
96-
android.setTestBuildType("release");
97-
project
98-
.getTasks()
99-
.all(
100-
task -> {
101-
if ("testDebugUnitTest".equals(task.getName())) {
102-
task.setEnabled(false);
103-
}
104-
});
105-
}
106-
10793
setupApiInformationAnalysis(project, android);
10894
android.testServer(new FirebaseTestServer(project, firebaseLibrary.testLab, android));
10995

0 commit comments

Comments
 (0)