From 38f6fe8b82bfebd0b7d60aa1359dbe58e970615c Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Tue, 14 Sep 2021 21:18:45 -0700 Subject: [PATCH 1/3] Fix the logic to generate .pro file --- android_build_files/generate_proguard.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/android_build_files/generate_proguard.gradle b/android_build_files/generate_proguard.gradle index 082e157d42..55f5c87246 100644 --- a/android_build_files/generate_proguard.gradle +++ b/android_build_files/generate_proguard.gradle @@ -44,6 +44,7 @@ def generateCppProguard(File library, String outCppPro) { // proguardSet: The set of proguard files to use. // outputProguard: The path to the output proguard file. def generateFinalProguard(Set proguardSet, String outputProguard) { + Set proguardLineSet = new HashSet() for (File pro : proguardSet) { for (String line : pro.text.split("[\\r\\n]+")) { @@ -79,9 +80,12 @@ def defineGenerateProguardFile(String subproject, String buildType, Set librarySet = fileTree("$nativeBuildDir") .matching({ include "**/*firebase_${subproject}*" }).getFiles() String cppProguard = "$buildDir/cpp_${subproject}.pro" - if (!librarySet.isEmpty()) { + while (!librarySet.isEmpty()) { File lib = librarySet.iterator().next() - generateCppProguard(lib, cppProguard) + librarySet.remove(lib) + if (lib.name.endsWith(".a")) { + generateCppProguard(lib, cppProguard) + } } // Combine the proguard files into a single file. From 3697224fdc7f2421bb669bc191f56c89b2bfcd18 Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Wed, 15 Sep 2021 10:37:08 -0700 Subject: [PATCH 2/3] update readme file --- release_build_files/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 244a44ceaa..43c1990260 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -570,6 +570,8 @@ code. ### 8.4.0 - Changes - General: Updating Android and iOS dependencies to the latest. + - General: Fix the generating of proguard file + ([#664](https://github.com/firebase/firebase-cpp-sdk/pull/664)). - Firestore: Added `operator==` and `operator!=` for `SnapshotMetadata`, `Settings`, `QuerySnapshot`, `DocumentSnapshot`, `SetOptions`, and `DocumentChange`. From e80ea397914214b3e7f486a6cda653c91b132d76 Mon Sep 17 00:00:00 2001 From: Cynthia Jiang Date: Wed, 15 Sep 2021 10:50:38 -0700 Subject: [PATCH 3/3] modify the release notes --- release_build_files/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 106fc30c63..4ed5bae95e 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -570,12 +570,12 @@ code. ### 8.5.0 - Changes - General: Updating Android and iOS dependencies to the latest. + - General: Fix the generating of proguard file + ([#664](https://github.com/firebase/firebase-cpp-sdk/pull/664)). ### 8.4.0 - Changes - General: Updating Android and iOS dependencies to the latest. - - General: Fix the generating of proguard file - ([#664](https://github.com/firebase/firebase-cpp-sdk/pull/664)). - Firestore: Added `operator==` and `operator!=` for `SnapshotMetadata`, `Settings`, `QuerySnapshot`, `DocumentSnapshot`, `SetOptions`, and `DocumentChange`.