Skip to content

Commit 36c3398

Browse files
AlmostMattAlmostMatt
authored
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.
1 parent c4618f5 commit 36c3398

15 files changed

+157
-76
lines changed

‎docs/readme.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,11 @@ Support
7171

7272
Release Notes
7373
-------------
74-
# 11.0.1
74+
# Upcoming release
7575
- Changes
7676
- Auth: Remove internal methods.
77+
- General: Fix an [issue](https://github.com/firebase/firebase-unity-sdk/issues/726)
78+
where AppCheck bundles were unintentionally included in App in the tgz.
7779

7880
### 11.0.0
7981
- Changes

‎scripts/create_debug_export.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
export config for each product.
1919
2020
Example usage:
21-
python scripts/build_scripts/create_debug_export.py
21+
python scripts/create_debug_export.py
2222
"""
2323

2424
import os
@@ -78,7 +78,6 @@ def main(argv):
7878
elif package_dict["name"] == package_name:
7979
output_package_list.append(packages[idx])
8080
output_dict["packages"] = output_package_list
81-
output_dict["builds"] = builds
8281

8382
with open(output_path, 'w', encoding='utf-8') as fout:
8483
fout.write(json.dumps(output_dict, indent=2))

‎unity_packer/debug_single_export_json/analytics.json

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,30 @@
4040
],
4141
"cpu": "AnyCPU",
4242
"paths": [
43-
"Plugins/iOS/Firebase/libFirebaseCppApp.a",
4443
"Firebase/Plugins/iOS/Firebase.App.dll",
4544
"Firebase/Plugins/iOS/Firebase.App.pdb"
4645
]
4746
},
47+
{
48+
"importer": "PluginImporter",
49+
"platforms": [
50+
"iOS"
51+
],
52+
"cpu": "AnyCPU",
53+
"paths": [
54+
"Plugins/iOS/Firebase/libFirebaseCppApp.a"
55+
]
56+
},
57+
{
58+
"importer": "PluginImporter",
59+
"platforms": [
60+
"tvOS"
61+
],
62+
"cpu": "AnyCPU",
63+
"paths": [
64+
"Plugins/tvOS/Firebase/libFirebaseCppApp.a"
65+
]
66+
},
4867
{
4968
"importer": "PluginImporter",
5069
"platforms": [],
@@ -128,7 +147,8 @@
128147
],
129148
"cpu": "x86_64",
130149
"paths": [
131-
"Firebase/Plugins/x86_64/FirebaseCppApp*"
150+
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
151+
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
132152
]
133153
},
134154
{
@@ -166,9 +186,9 @@
166186
"export_upm": 1,
167187
"upm_package_config": {
168188
"manifest": {
169-
"unity": "2018.1",
189+
"unity": "2019.1",
170190
"dependencies": {
171-
"com.google.external-dependency-manager": "1.2.172"
191+
"com.google.external-dependency-manager": "1.2.176"
172192
}
173193
}
174194
}
@@ -318,7 +338,7 @@
318338
"export_upm": 1,
319339
"upm_package_config": {
320340
"manifest": {
321-
"unity": "2018.1"
341+
"unity": "2019.1"
322342
}
323343
}
324344
}

‎unity_packer/debug_single_export_json/app_check.json

Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@
147147
],
148148
"cpu": "x86_64",
149149
"paths": [
150-
"Firebase/Plugins/x86_64/FirebaseCppApp*"
150+
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
151+
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
151152
]
152153
},
153154
{
@@ -185,9 +186,9 @@
185186
"export_upm": 1,
186187
"upm_package_config": {
187188
"manifest": {
188-
"unity": "2018.1",
189+
"unity": "2019.1",
189190
"dependencies": {
190-
"com.google.external-dependency-manager": "1.2.172"
191+
"com.google.external-dependency-manager": "1.2.176"
191192
}
192193
}
193194
}
@@ -215,7 +216,11 @@
215216
"imports": [
216217
{
217218
"importer": "PluginImporter",
218-
"platforms": ["Editor", "Standalone", "Android"],
219+
"platforms": [
220+
"Editor",
221+
"Standalone",
222+
"Android"
223+
],
219224
"cpu": "AnyCPU",
220225
"paths": [
221226
"Firebase/Plugins/Firebase.AppCheck.dll",
@@ -224,7 +229,10 @@
224229
},
225230
{
226231
"importer": "PluginImporter",
227-
"platforms": ["iOS", "tvOS"],
232+
"platforms": [
233+
"iOS",
234+
"tvOS"
235+
],
228236
"cpu": "AnyCPU",
229237
"paths": [
230238
"Firebase/Plugins/iOS/Firebase.AppCheck.dll",
@@ -233,15 +241,19 @@
233241
},
234242
{
235243
"importer": "PluginImporter",
236-
"platforms": ["iOS"],
244+
"platforms": [
245+
"iOS"
246+
],
237247
"cpu": "AnyCPU",
238248
"paths": [
239249
"Plugins/iOS/Firebase/libFirebaseCppAppCheck.a"
240250
]
241251
},
242252
{
243253
"importer": "PluginImporter",
244-
"platforms": ["tvOS"],
254+
"platforms": [
255+
"tvOS"
256+
],
245257
"cpu": "AnyCPU",
246258
"paths": [
247259
"Plugins/tvOS/Firebase/libFirebaseCppAppCheck.a"
@@ -256,22 +268,30 @@
256268
},
257269
{
258270
"importer": "PluginImporter",
259-
"platforms": ["Editor", "Standalone"],
271+
"platforms": [
272+
"Editor",
273+
"Standalone"
274+
],
260275
"cpu": "x86_64",
261276
"paths": [
262277
"Firebase/Plugins/x86_64/FirebaseCppAppCheck*"
263278
]
264279
},
265280
{
266281
"importer": "DefaultImporter",
267-
"sections": ["samples"],
282+
"sections": [
283+
"samples"
284+
],
268285
"paths": [
269286
"Firebase/Sample/AppCheck/"
270287
]
271288
},
272289
{
273290
"importer": "DefaultImporter",
274-
"sections": ["samples", "documentation"],
291+
"sections": [
292+
"samples",
293+
"documentation"
294+
],
275295
"paths": [
276296
"Firebase/Editor/AppCheckReadme.md"
277297
]
@@ -283,10 +303,10 @@
283303
],
284304
"manifest_path": "Firebase/Editor",
285305
"readme": "Firebase/Editor/AppCheckReadme.md",
286-
"changelog" : "Firebase/Editor/readme.md",
287-
"license" : "Firebase/Editor/LICENSE",
288-
"documentation" : "Firebase/Editor/AppCheckReadme.md",
289-
"common_manifest" : {
306+
"changelog": "Firebase/Editor/readme.md",
307+
"license": "Firebase/Editor/LICENSE",
308+
"documentation": "Firebase/Editor/AppCheckReadme.md",
309+
"common_manifest": {
290310
"name": "com.google.firebase.app-check",
291311
"display_name": "Firebase App Check",
292312
"description": [
@@ -295,18 +315,22 @@
295315
"resources. It works with both Firebase services, Google Cloud ",
296316
"services, and your own APIs to keep your resources safe."
297317
],
298-
"keywords": ["Google", "Firebase", "App Check"],
318+
"keywords": [
319+
"Google",
320+
"Firebase",
321+
"App Check"
322+
],
299323
"author": {
300-
"name" : "Google LLC",
324+
"name": "Google LLC",
301325
"url": "https://firebase.google.com/docs/app-check"
302326
}
303327
},
304328
"export_upm": 1,
305-
"upm_package_config" : {
306-
"manifest" : {
307-
"unity": "2018.1"
329+
"upm_package_config": {
330+
"manifest": {
331+
"unity": "2019.1"
308332
}
309333
}
310334
}
311335
]
312-
}
336+
}

‎unity_packer/debug_single_export_json/auth.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@
147147
],
148148
"cpu": "x86_64",
149149
"paths": [
150-
"Firebase/Plugins/x86_64/FirebaseCppApp*"
150+
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
151+
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
151152
]
152153
},
153154
{
@@ -185,9 +186,9 @@
185186
"export_upm": 1,
186187
"upm_package_config": {
187188
"manifest": {
188-
"unity": "2018.1",
189+
"unity": "2019.1",
189190
"dependencies": {
190-
"com.google.external-dependency-manager": "1.2.172"
191+
"com.google.external-dependency-manager": "1.2.176"
191192
}
192193
}
193194
}
@@ -336,7 +337,7 @@
336337
"export_upm": 1,
337338
"upm_package_config": {
338339
"manifest": {
339-
"unity": "2018.1"
340+
"unity": "2019.1"
340341
}
341342
}
342343
}

‎unity_packer/debug_single_export_json/crashlytics.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@
147147
],
148148
"cpu": "x86_64",
149149
"paths": [
150-
"Firebase/Plugins/x86_64/FirebaseCppApp*"
150+
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
151+
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
151152
]
152153
},
153154
{
@@ -185,9 +186,9 @@
185186
"export_upm": 1,
186187
"upm_package_config": {
187188
"manifest": {
188-
"unity": "2018.1",
189+
"unity": "2019.1",
189190
"dependencies": {
190-
"com.google.external-dependency-manager": "1.2.172"
191+
"com.google.external-dependency-manager": "1.2.176"
191192
}
192193
}
193194
}
@@ -255,7 +256,7 @@
255256
],
256257
"cpu": "AnyCPU",
257258
"paths": [
258-
"Plugins/tvOS/Firebase/libFirebaseCppCrashlytics.a",
259+
"Plugins/tvOS/Firebase/libFirebaseCppCrashlytics.a"
259260
]
260261
},
261262
{
@@ -333,7 +334,7 @@
333334
"export_upm": 1,
334335
"upm_package_config": {
335336
"manifest": {
336-
"unity": "2018.1"
337+
"unity": "2019.1"
337338
}
338339
}
339340
}

‎unity_packer/debug_single_export_json/database.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@
147147
],
148148
"cpu": "x86_64",
149149
"paths": [
150-
"Firebase/Plugins/x86_64/FirebaseCppApp*"
150+
"Firebase/Plugins/x86_64/FirebaseCppApp-*",
151+
"Firebase/Plugins/x86_64/FirebaseCppApp.*"
151152
]
152153
},
153154
{
@@ -185,9 +186,9 @@
185186
"export_upm": 1,
186187
"upm_package_config": {
187188
"manifest": {
188-
"unity": "2018.1",
189+
"unity": "2019.1",
189190
"dependencies": {
190-
"com.google.external-dependency-manager": "1.2.172"
191+
"com.google.external-dependency-manager": "1.2.176"
191192
}
192193
}
193194
}
@@ -350,7 +351,7 @@
350351
"export_upm": 1,
351352
"upm_package_config": {
352353
"manifest": {
353-
"unity": "2018.1"
354+
"unity": "2019.1"
354355
}
355356
}
356357
}

0 commit comments

Comments
 (0)