Skip to content

Commit f6c6c74

Browse files
committed
fix(google_sign_in_android): Rename keep.xml to gsi_keep.xml
Resolves resource collision in global Android resource namespace. Fixes flutter/flutter#194943.
1 parent 4edbc53 commit f6c6c74

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎packages/google_sign_in/google_sign_in_android/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## 7.2.19
22

3-
* Renames the android keep.xml to google_sign_in_keep.xml to prevent overriding by app's keep.xml during resource merging.
3+
* Renames the android `keep.xml` to `gsi_keep.xml` to prevent overriding by app's `keep.xml` during resource merging.
44

55
## 7.2.18
66

packages/google_sign_in/google_sign_in_android/android/src/main/res/raw/google_sign_in_keep.xml renamed to packages/google_sign_in/google_sign_in_android/android/src/main/res/raw/gsi_keep.xml

File renamed without changes.

‎packages/google_sign_in/google_sign_in_android/test/resource_collision_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void main() {
2525
], workingDirectory: '${exampleDir.path}/android');
2626
expect(result.exitCode, 0, reason: 'Gradle build failed: ${result.stderr}\\n${result.stdout}');
2727

28-
// Find the merged keep.xml or google_sign_in_keep.xml file
28+
// Find the merged keep.xml or gsi_keep.xml file
2929
final appResDir = Directory(
3030
'${exampleDir.path}/build/app/intermediates/packaged_res/debug/packageDebugResources/raw',
3131
);
@@ -35,7 +35,7 @@ void main() {
3535

3636
final mergedAppKeepXml = File('${appResDir.path}/keep.xml');
3737
final pluginGenericKeepXml = File('${pluginResDir.path}/keep.xml');
38-
final pluginSpecificKeepXml = File('${pluginResDir.path}/google_sign_in_keep.xml');
38+
final pluginSpecificKeepXml = File('${pluginResDir.path}/gsi_keep.xml');
3939

4040
String? pluginContent;
4141

0 commit comments

Comments
 (0)