From 36c3398cf59e75201f87abffb31b298b4a731116 Mon Sep 17 00:00:00 2001 From: Matthew Hyndman Date: Wed, 17 May 2023 12:48:55 -0400 Subject: [PATCH] Update Unity export so that App does not include AppCheck files (#729) * Match App. and App- instead of App*. Also fix create_debug_export and run it. --- docs/readme.md | 4 +- scripts/create_debug_export.py | 3 +- .../debug_single_export_json/analytics.json | 30 +++++++-- .../debug_single_export_json/app_check.json | 64 +++++++++++++------ .../debug_single_export_json/auth.json | 9 +-- .../debug_single_export_json/crashlytics.json | 11 ++-- .../debug_single_export_json/database.json | 9 +-- .../dynamic_links.json | 39 ++++++++--- .../debug_single_export_json/firestore.json | 9 +-- .../debug_single_export_json/functions.json | 9 +-- .../installations.json | 9 +-- .../debug_single_export_json/messaging.json | 13 ++-- .../remote_config.json | 9 +-- .../debug_single_export_json/storage.json | 12 ++-- unity_packer/exports.json | 3 +- 15 files changed, 157 insertions(+), 76 deletions(-) diff --git a/docs/readme.md b/docs/readme.md index f9dc74cb..976821b4 100644 --- a/docs/readme.md +++ b/docs/readme.md @@ -71,9 +71,11 @@ Support Release Notes ------------- -# 11.0.1 +# Upcoming release - Changes - Auth: Remove internal methods. + - General: Fix an [issue](https://github.com/firebase/firebase-unity-sdk/issues/726) + where AppCheck bundles were unintentionally included in App in the tgz. ### 11.0.0 - Changes diff --git a/scripts/create_debug_export.py b/scripts/create_debug_export.py index 5bda647d..9a71f03a 100644 --- a/scripts/create_debug_export.py +++ b/scripts/create_debug_export.py @@ -18,7 +18,7 @@ export config for each product. Example usage: - python scripts/build_scripts/create_debug_export.py + python scripts/create_debug_export.py """ import os @@ -78,7 +78,6 @@ def main(argv): elif package_dict["name"] == package_name: output_package_list.append(packages[idx]) output_dict["packages"] = output_package_list - output_dict["builds"] = builds with open(output_path, 'w', encoding='utf-8') as fout: fout.write(json.dumps(output_dict, indent=2)) diff --git a/unity_packer/debug_single_export_json/analytics.json b/unity_packer/debug_single_export_json/analytics.json index 7d922385..e3fa3ac2 100644 --- a/unity_packer/debug_single_export_json/analytics.json +++ b/unity_packer/debug_single_export_json/analytics.json @@ -40,11 +40,30 @@ ], "cpu": "AnyCPU", "paths": [ - "Plugins/iOS/Firebase/libFirebaseCppApp.a", "Firebase/Plugins/iOS/Firebase.App.dll", "Firebase/Plugins/iOS/Firebase.App.pdb" ] }, + { + "importer": "PluginImporter", + "platforms": [ + "iOS" + ], + "cpu": "AnyCPU", + "paths": [ + "Plugins/iOS/Firebase/libFirebaseCppApp.a" + ] + }, + { + "importer": "PluginImporter", + "platforms": [ + "tvOS" + ], + "cpu": "AnyCPU", + "paths": [ + "Plugins/tvOS/Firebase/libFirebaseCppApp.a" + ] + }, { "importer": "PluginImporter", "platforms": [], @@ -128,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -166,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -318,7 +338,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/app_check.json b/unity_packer/debug_single_export_json/app_check.json index 0ddae185..cb83e71f 100644 --- a/unity_packer/debug_single_export_json/app_check.json +++ b/unity_packer/debug_single_export_json/app_check.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -215,7 +216,11 @@ "imports": [ { "importer": "PluginImporter", - "platforms": ["Editor", "Standalone", "Android"], + "platforms": [ + "Editor", + "Standalone", + "Android" + ], "cpu": "AnyCPU", "paths": [ "Firebase/Plugins/Firebase.AppCheck.dll", @@ -224,7 +229,10 @@ }, { "importer": "PluginImporter", - "platforms": ["iOS", "tvOS"], + "platforms": [ + "iOS", + "tvOS" + ], "cpu": "AnyCPU", "paths": [ "Firebase/Plugins/iOS/Firebase.AppCheck.dll", @@ -233,7 +241,9 @@ }, { "importer": "PluginImporter", - "platforms": ["iOS"], + "platforms": [ + "iOS" + ], "cpu": "AnyCPU", "paths": [ "Plugins/iOS/Firebase/libFirebaseCppAppCheck.a" @@ -241,7 +251,9 @@ }, { "importer": "PluginImporter", - "platforms": ["tvOS"], + "platforms": [ + "tvOS" + ], "cpu": "AnyCPU", "paths": [ "Plugins/tvOS/Firebase/libFirebaseCppAppCheck.a" @@ -256,7 +268,10 @@ }, { "importer": "PluginImporter", - "platforms": ["Editor", "Standalone"], + "platforms": [ + "Editor", + "Standalone" + ], "cpu": "x86_64", "paths": [ "Firebase/Plugins/x86_64/FirebaseCppAppCheck*" @@ -264,14 +279,19 @@ }, { "importer": "DefaultImporter", - "sections": ["samples"], + "sections": [ + "samples" + ], "paths": [ "Firebase/Sample/AppCheck/" ] }, { "importer": "DefaultImporter", - "sections": ["samples", "documentation"], + "sections": [ + "samples", + "documentation" + ], "paths": [ "Firebase/Editor/AppCheckReadme.md" ] @@ -283,10 +303,10 @@ ], "manifest_path": "Firebase/Editor", "readme": "Firebase/Editor/AppCheckReadme.md", - "changelog" : "Firebase/Editor/readme.md", - "license" : "Firebase/Editor/LICENSE", - "documentation" : "Firebase/Editor/AppCheckReadme.md", - "common_manifest" : { + "changelog": "Firebase/Editor/readme.md", + "license": "Firebase/Editor/LICENSE", + "documentation": "Firebase/Editor/AppCheckReadme.md", + "common_manifest": { "name": "com.google.firebase.app-check", "display_name": "Firebase App Check", "description": [ @@ -295,18 +315,22 @@ "resources. It works with both Firebase services, Google Cloud ", "services, and your own APIs to keep your resources safe." ], - "keywords": ["Google", "Firebase", "App Check"], + "keywords": [ + "Google", + "Firebase", + "App Check" + ], "author": { - "name" : "Google LLC", + "name": "Google LLC", "url": "https://firebase.google.com/docs/app-check" } }, "export_upm": 1, - "upm_package_config" : { - "manifest" : { - "unity": "2018.1" + "upm_package_config": { + "manifest": { + "unity": "2019.1" } } } ] -} +} \ No newline at end of file diff --git a/unity_packer/debug_single_export_json/auth.json b/unity_packer/debug_single_export_json/auth.json index bce16c22..99f549e8 100644 --- a/unity_packer/debug_single_export_json/auth.json +++ b/unity_packer/debug_single_export_json/auth.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -336,7 +337,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/crashlytics.json b/unity_packer/debug_single_export_json/crashlytics.json index 08bdb7e1..60a0ec8a 100644 --- a/unity_packer/debug_single_export_json/crashlytics.json +++ b/unity_packer/debug_single_export_json/crashlytics.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -255,7 +256,7 @@ ], "cpu": "AnyCPU", "paths": [ - "Plugins/tvOS/Firebase/libFirebaseCppCrashlytics.a", + "Plugins/tvOS/Firebase/libFirebaseCppCrashlytics.a" ] }, { @@ -333,7 +334,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/database.json b/unity_packer/debug_single_export_json/database.json index 73a2f4df..b834a22d 100644 --- a/unity_packer/debug_single_export_json/database.json +++ b/unity_packer/debug_single_export_json/database.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -350,7 +351,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/dynamic_links.json b/unity_packer/debug_single_export_json/dynamic_links.json index 5b9fe95b..ac7d31b6 100644 --- a/unity_packer/debug_single_export_json/dynamic_links.json +++ b/unity_packer/debug_single_export_json/dynamic_links.json @@ -9,7 +9,8 @@ "Editor", "Standalone", "Android", - "iOS" + "iOS", + "tvOS" ], "cpu": "AnyCPU", "paths": [ @@ -34,15 +35,35 @@ { "importer": "PluginImporter", "platforms": [ - "iOS" + "iOS", + "tvOS" ], "cpu": "AnyCPU", "paths": [ - "Plugins/iOS/Firebase/libFirebaseCppApp.a", "Firebase/Plugins/iOS/Firebase.App.dll", "Firebase/Plugins/iOS/Firebase.App.pdb" ] }, + { + "importer": "PluginImporter", + "platforms": [ + "iOS" + ], + "cpu": "AnyCPU", + "paths": [ + "Plugins/iOS/Firebase/libFirebaseCppApp.a" + ] + }, + { + "importer": "PluginImporter", + "platforms": [ + "tvOS" + ], + "cpu": "AnyCPU", + "paths": [ + "Plugins/tvOS/Firebase/libFirebaseCppApp.a" + ] + }, { "importer": "PluginImporter", "platforms": [], @@ -69,7 +90,8 @@ "Editor", "Standalone", "Android", - "iOS" + "iOS", + "tvOS" ], "cpu": "AnyCPU", "paths": [ @@ -125,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -163,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -287,7 +310,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/firestore.json b/unity_packer/debug_single_export_json/firestore.json index c51be813..38df5848 100644 --- a/unity_packer/debug_single_export_json/firestore.json +++ b/unity_packer/debug_single_export_json/firestore.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -332,7 +333,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/functions.json b/unity_packer/debug_single_export_json/functions.json index a531a70e..ab48e1b8 100644 --- a/unity_packer/debug_single_export_json/functions.json +++ b/unity_packer/debug_single_export_json/functions.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -331,7 +332,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/installations.json b/unity_packer/debug_single_export_json/installations.json index c81cbb12..b2266bca 100644 --- a/unity_packer/debug_single_export_json/installations.json +++ b/unity_packer/debug_single_export_json/installations.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -331,7 +332,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/messaging.json b/unity_packer/debug_single_export_json/messaging.json index 14c26bf1..3163da58 100644 --- a/unity_packer/debug_single_export_json/messaging.json +++ b/unity_packer/debug_single_export_json/messaging.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -300,7 +301,9 @@ }, { "importer": "PluginImporter", - "platforms": ["Android"], + "platforms": [ + "Android" + ], "cpu": "AnyCPU", "paths": [ "Firebase/Plugins/Android/firebase-messaging-cpp.aar" @@ -367,7 +370,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/remote_config.json b/unity_packer/debug_single_export_json/remote_config.json index 7110b83b..b066e6b2 100644 --- a/unity_packer/debug_single_export_json/remote_config.json +++ b/unity_packer/debug_single_export_json/remote_config.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -336,7 +337,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/debug_single_export_json/storage.json b/unity_packer/debug_single_export_json/storage.json index b3f80526..f4d866e7 100644 --- a/unity_packer/debug_single_export_json/storage.json +++ b/unity_packer/debug_single_export_json/storage.json @@ -147,7 +147,8 @@ ], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, { @@ -185,9 +186,9 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1", + "unity": "2019.1", "dependencies": { - "com.google.external-dependency-manager": "1.2.172" + "com.google.external-dependency-manager": "1.2.176" } } } @@ -264,7 +265,8 @@ "Editor", "Standalone", "Android", - "iOS" + "iOS", + "tvOS" ], "cpu": "AnyCPU", "paths": [ @@ -353,7 +355,7 @@ "export_upm": 1, "upm_package_config": { "manifest": { - "unity": "2018.1" + "unity": "2019.1" } } } diff --git a/unity_packer/exports.json b/unity_packer/exports.json index c32117a3..7bf11e9f 100644 --- a/unity_packer/exports.json +++ b/unity_packer/exports.json @@ -113,7 +113,8 @@ "platforms": ["Editor", "Standalone"], "cpu": "x86_64", "paths": [ - "Firebase/Plugins/x86_64/FirebaseCppApp*" + "Firebase/Plugins/x86_64/FirebaseCppApp-*", + "Firebase/Plugins/x86_64/FirebaseCppApp.*" ] }, {