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.
firebase · May 17, 2023 · 36c3398 · 36c3398
1 parent c4618f5
commit 36c3398
Show file tree

Hide file tree

Showing 15 changed files with 157 additions and 76 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,15 +241,19 @@
         },
         {
           "importer": "PluginImporter",
-          "platforms": ["iOS"],
+          "platforms": [
+            "iOS"
+          ],
           "cpu": "AnyCPU",
           "paths": [
             "Plugins/iOS/Firebase/libFirebaseCppAppCheck.a"
           ]
         },
         {
           "importer": "PluginImporter",
-          "platforms": ["tvOS"],
+          "platforms": [
+            "tvOS"
+          ],
           "cpu": "AnyCPU",
           "paths": [
             "Plugins/tvOS/Firebase/libFirebaseCppAppCheck.a"
@@ -256,22 +268,30 @@
         },
         {
           "importer": "PluginImporter",
-          "platforms": ["Editor", "Standalone"],
+          "platforms": [
+            "Editor",
+            "Standalone"
+          ],
           "cpu": "x86_64",
           "paths": [
             "Firebase/Plugins/x86_64/FirebaseCppAppCheck*"
           ]
         },
         {
           "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"
         }
       }
     }
   ]
-}
+}
diff --git 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
@@ -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
@@ -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"
         }
       }
     }