Skip to content

Commit 82280ca

Browse files
committed
Merge branch 'master' into mila/BloomFilter
2 parents b306135 + 9d99981 commit 82280ca

File tree

23 files changed

+324
-428
lines changed

23 files changed

+324
-428
lines changed

.github/workflows/build-release-artifacts.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ jobs:
1717
- name: Perform gradle build
1818
run: |
1919
./gradlew firebasePublish -PpublishConfigFilePath=release.cfg -PpublishMode=RELEASE -PincludeFireEscapeArtifacts=true
20+
21+
- name: Generate release notes
22+
run: |
23+
python3 docs/make_release_notes.py
24+
cd build/changelog && zip -r ../release_notes.zip android
25+
2026
- name: Upload generated artifacts
2127
uses: actions/upload-artifact@v2
2228
with:
2329
name: release_artifacts
2430
path: build/*.zip
25-
retention-days: 5
31+
retention-days: 15

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)