Skip to content

Commit fea70f7

Browse files
authored
Revert "Migrate vendor plugin to new transform api. (#4424)" (#4622)
This reverts commit ffc5d33.
1 parent 6792b9b commit fea70f7

File tree

16 files changed

+377
-268
lines changed

16 files changed

+377
-268
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.google.firebase.appcheck.ktx">
3+
<!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
4+
<!--<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />-->
5+
<uses-permission android:name="android.permission.INTERNET"/>
6+
<application>
7+
<uses-library android:name="android.test.runner" />
8+
</application>
9+
10+
<instrumentation
11+
android:name="androidx.test.runner.AndroidJUnitRunner"
12+
android:targetPackage="com.google.firebase.appcheck.ktx" />
13+
</manifest>

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.4.0")
66-
implementation("com.android.tools.build:builder-test-api:7.4.0")
65+
implementation("com.android.tools.build:gradle:7.2.2")
66+
implementation("com.android.tools.build:builder-test-api:7.2.2")
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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,20 @@ 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+
93107
setupApiInformationAnalysis(project, android);
94108
android.testServer(new FirebaseTestServer(project, firebaseLibrary.testLab, android));
95109

0 commit comments

Comments
 (0)