Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Unity export so that App does not include AppCheck files #729

Merged
merged 5 commits into from
May 17, 2023
Merged

Update Unity export so that App does not include AppCheck files #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6cd2585
Match App. and App- instead of App*. Also fix create_debug_export and…
AlmostMatt May 15, 2023
7643ff5
try simpler glob pattern for windows
AlmostMatt May 16, 2023
33bfdd0
add release note
AlmostMatt May 17, 2023
47ee7c9
remove bracket
AlmostMatt May 17, 2023
3a571f0
readme rephrase
AlmostMatt May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions scripts/create_debug_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down
30 changes: 25 additions & 5 deletions unity_packer/debug_single_export_json/analytics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down Expand Up @@ -128,7 +147,8 @@
],
"cpu": "x86_64",
"paths": [
"Firebase/Plugins/x86_64/FirebaseCppApp*"
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
]
},
{
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -318,7 +338,7 @@
"export_upm": 1,
"upm_package_config": {
"manifest": {
"unity": "2018.1"
"unity": "2019.1"
}
}
}
Expand Down
64 changes: 44 additions & 20 deletions unity_packer/debug_single_export_json/app_check.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@
],
"cpu": "x86_64",
"paths": [
"Firebase/Plugins/x86_64/FirebaseCppApp*"
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
]
},
{
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -215,7 +216,11 @@
"imports": [
{
"importer": "PluginImporter",
"platforms": ["Editor", "Standalone", "Android"],
"platforms": [
"Editor",
"Standalone",
"Android"
],
"cpu": "AnyCPU",
"paths": [
"Firebase/Plugins/Firebase.AppCheck.dll",
Expand All @@ -224,7 +229,10 @@
},
{
"importer": "PluginImporter",
"platforms": ["iOS", "tvOS"],
"platforms": [
"iOS",
"tvOS"
],
"cpu": "AnyCPU",
"paths": [
"Firebase/Plugins/iOS/Firebase.AppCheck.dll",
Expand All @@ -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"
Expand All @@ -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"
]
Expand All @@ -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": [
Expand All @@ -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"
}
}
}
]
}
}
9 changes: 5 additions & 4 deletions unity_packer/debug_single_export_json/auth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@
],
"cpu": "x86_64",
"paths": [
"Firebase/Plugins/x86_64/FirebaseCppApp*"
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
]
},
{
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -336,7 +337,7 @@
"export_upm": 1,
"upm_package_config": {
"manifest": {
"unity": "2018.1"
"unity": "2019.1"
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions unity_packer/debug_single_export_json/crashlytics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@
],
"cpu": "x86_64",
"paths": [
"Firebase/Plugins/x86_64/FirebaseCppApp*"
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
]
},
{
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -255,7 +256,7 @@
],
"cpu": "AnyCPU",
"paths": [
"Plugins/tvOS/Firebase/libFirebaseCppCrashlytics.a",
"Plugins/tvOS/Firebase/libFirebaseCppCrashlytics.a"
]
},
{
Expand Down Expand Up @@ -333,7 +334,7 @@
"export_upm": 1,
"upm_package_config": {
"manifest": {
"unity": "2018.1"
"unity": "2019.1"
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions unity_packer/debug_single_export_json/database.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@
],
"cpu": "x86_64",
"paths": [
"Firebase/Plugins/x86_64/FirebaseCppApp*"
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
]
},
{
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -350,7 +351,7 @@
"export_upm": 1,
"upm_package_config": {
"manifest": {
"unity": "2018.1"
"unity": "2019.1"
}
}
}
Expand Down
Loading