Skip to content

Commit 2781174

Browse files
committed
Some feedback
1 parent 86c04f3 commit 2781174

File tree

3 files changed

+57
-52
lines changed

3 files changed

+57
-52
lines changed

.gitignore

-46
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,3 @@ vcpkg
3030

3131
# Visual Studio Code
3232
.vscode/
33-
34-
# Firestore testapp
35-
firestore/testapp/**/*.dll
36-
firestore/testapp/**/*.pdb
37-
firestore/testapp/**/*.bundle
38-
firestore/testapp/**/*.meta
39-
40-
firestore/testapp/Assets/Plugins
41-
firestore/testapp/Assets/StreamingAssets
42-
firestore/testapp/Assets/Editor Default Resources
43-
firestore/testapp/Assets/ExternalDependencyManager
44-
firestore/testapp/Assets/Firebase/Editor/*.xml
45-
firestore/testapp/Assets/Firebase/Editor/*.txt
46-
firestore/testapp/Assets/Firebase/Editor/*.exe
47-
firestore/testapp/Assets/Firebase/Editor/*.py
48-
firestore/testapp/Assets/Firebase/Sample/AutomatedTestRunner.cs
49-
firestore/testapp/Assets/Firebase/Sample/ftl_testapp_files
50-
firestore/testapp/Assets/Firebase/m2repository
51-
52-
firestore/testapp/Library
53-
firestore/testapp/Logs
54-
firestore/testapp/Packages
55-
firestore/testapp/Temp
56-
firestore/testapp/UserSettings
57-
firestore/testapp/android_BackUpThisFolder_ButDontShipItWithYourGame
58-
firestore/testapp/ios
59-
firestore/testapp/macos.app/Contents
60-
firestore/testapp/obj/Debug
61-
firestore/testapp/Assembly-CSharp-Editor.csproj
62-
firestore/testapp/Assembly-CSharp-firstpass.csproj
63-
firestore/testapp/Assembly-CSharp.csproj
64-
firestore/testapp/Tests.csproj
65-
firestore/testapp/android.apk
66-
firestore/testapp/android_mapping.txt
67-
firestore/testapp/testapp.sln
68-
69-
firestore/testapp/ProjectSettings/AndroidResolverDependencies.xml
70-
firestore/testapp/ProjectSettings/GvhProjectSettings.xml
71-
firestore/testapp/ProjectSettings/MemorySettings.asset
72-
firestore/testapp/ProjectSettings/PackageManagerSettings.asset
73-
firestore/testapp/ProjectSettings/PresetManager.asset
74-
firestore/testapp/ProjectSettings/TimelineSettings.asset
75-
firestore/testapp/ProjectSettings/VFXManager.asset
76-
firestore/testapp/ProjectSettings/VersionControlSettings.asset
77-
firestore/testapp/ProjectSettings/XRSettings.asset
78-
firestore/testapp/ProjectSettings/boot.config

firestore/.gitignore

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
testapp/**/*.dll
2+
testapp/**/*.pdb
3+
testapp/**/*.bundle
4+
testapp/**/*.meta
5+
6+
testapp/Assets/Plugins
7+
testapp/Assets/StreamingAssets
8+
testapp/Assets/Editor Default Resources
9+
testapp/Assets/ExternalDependencyManager
10+
testapp/Assets/Firebase/Editor/*.xml
11+
testapp/Assets/Firebase/Editor/*.txt
12+
testapp/Assets/Firebase/Editor/*.exe
13+
testapp/Assets/Firebase/Editor/*.py
14+
testapp/Assets/Firebase/Sample/AutomatedTestRunner.cs
15+
testapp/Assets/Firebase/Sample/ftl_testapp_files
16+
testapp/Assets/Firebase/m2repository
17+
18+
testapp/Library
19+
testapp/Logs
20+
testapp/Packages
21+
testapp/Temp
22+
testapp/UserSettings
23+
testapp/android_BackUpThisFolder_ButDontShipItWithYourGame
24+
testapp/ios
25+
testapp/macos.app/Contents
26+
testapp/obj/Debug
27+
testapp/Assembly-CSharp-Editor.csproj
28+
testapp/Assembly-CSharp-firstpass.csproj
29+
testapp/Assembly-CSharp.csproj
30+
testapp/Tests.csproj
31+
testapp/android.apk
32+
testapp/android_mapping.txt
33+
testapp/testapp.sln
34+
35+
testapp/ProjectSettings/AndroidResolverDependencies.xml
36+
testapp/ProjectSettings/GvhProjectSettings.xml
37+
testapp/ProjectSettings/MemorySettings.asset
38+
testapp/ProjectSettings/PackageManagerSettings.asset
39+
testapp/ProjectSettings/PresetManager.asset
40+
testapp/ProjectSettings/TimelineSettings.asset
41+
testapp/ProjectSettings/VFXManager.asset
42+
testapp/ProjectSettings/VersionControlSettings.asset
43+
testapp/ProjectSettings/XRSettings.asset
44+
testapp/ProjectSettings/boot.config

firestore/CONTRIBUTING.md

+13-6
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ the SDK, targeting desktop/Android/iOS.
66
# Prerequisites
77

88
Building the Unity SDK requires building the underlying C++ SDK. Refer to
9-
[][this doc] for what the prerequisites are.
9+
[https://github.com/firebase/firebase-cpp-sdk#prerequisites][this doc] for
10+
what the prerequisites are.
1011

1112
On top of above, you also need Unity installed (obviously). If you use an
12-
apple silicon machine as host, be sure to install the right version of
13-
Unity!
13+
apple silicon machine as host, be sure to install Unity for Apple Silicon,
14+
otherwise Unity will report missing binaries when you try to run the Testapp.
1415

1516
# Building Firestore Unity SDK
1617

@@ -33,6 +34,11 @@ python scripts/build_scripts/build_zips.py -platform=android -targets=auth -targ
3334
# Building for iOS. Incremental build for iOS is broken, so we use clean_build here.
3435
python scripts/build_scripts/build_zips.py -platform=android -targets=auth -targets=firestore -use_boringssl -clean_build
3536

37+
# Build with OPENSSL: above use boringssl by default, which could add to build time, you can
38+
# use a binary OPENSSL if you want to, by specifying the location with a ENV Variable.
39+
OPENSSL_ROOT_DIR=/opt/homebrew/opt/[email protected] python scripts/build_scripts/build_zips.py -platform=macos -targets=auth -targets=firestore
40+
41+
3642
# Other supported platforms are tvos,linux,windows
3743
```
3844

@@ -63,11 +69,12 @@ able to run this scene which in turn runs all integration tests for Firestore.
6369

6470
# Running Firestore Android TestApp
6571

66-
You *probably* need to use `IL2CPP` as scripting backend instead of `Mono` for Android. To do this,
67-
you can go to `Edit->Project Setting->Player->Android->Scripting Backend` and select `IL2CPP`.
72+
*Apple Silicon Unity user*: you need to use `IL2CPP` as scripting backend instead of `Mono` for Android, otherwise you
73+
cannot target for `ARM64`. To do this, you can go to
74+
`Edit->Project Setting->Player->Android->Scripting Backend` and select `IL2CPP`, and also select `Arm64` as target.
6875

6976
You also need to turn on `minification` under on the same setting page, by turning on `R8` under `publish
70-
settings`.
77+
settings`. Otherwise you could see build error from task `minifyDebugWithProguard`.
7178

7279
To run the Android testapp, go to `File->Build Settings`, select `Android` then click `Switch Platform`. After
7380
assets are loaded, click `Build and Run`.

0 commit comments

Comments
 (0)