Skip to content

Commit f1878e7

Browse files
authored
Merge pull request #207 from BranchMetrics/SDK-1818-update-sdk-versions
SDK-1818 update sdk versions and SDK-1817 unity branch.json support
2 parents af986e0 + f7fffa7 commit f1878e7

File tree

124 files changed

+390
-1851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+390
-1851
lines changed

.gitignore

Lines changed: 79 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,79 @@
1-
AndroidWrapperProject/.gradle
2-
AndroidWrapperProject/app/build
3-
AndroidWrapperProject/build
4-
BranchUnityTestBed/Library
5-
BranchUnityTestBed/Temp
6-
BranchUnityTestBed/Obj
7-
BranchUnityTestBed/Build?
8-
UnityConnectSettings.asset
9-
ClusterInputManager.asset
10-
Logs/
11-
12-
# Android Studio
13-
.idea
14-
*.iml
15-
build/
16-
17-
# Mac stuff
18-
*.DS_Store
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
4+
#
5+
*/[Ll]ibrary/
6+
*/[Tt]emp/
7+
*/[Oo]bj/
8+
*/[Bb]uild/
9+
*/[Bb]uilds/
10+
*/[Ll]ogs/
11+
*/[Uu]ser[Ss]ettings/
12+
13+
# MemoryCaptures can get excessive in size.
14+
# They also could contain extremely sensitive data
15+
/[Mm]emoryCaptures/
16+
17+
# Recordings can get excessive in size
18+
/[Rr]ecordings/
19+
20+
# ignore the asset store tools plugin
21+
/[Aa]ssets/AssetStoreTools*
22+
23+
# Autogenerated Jetbrains Rider plugin
24+
/[Aa]ssets/Plugins/Editor/JetBrains*
25+
26+
# Visual Studio cache directory
27+
.vs/
28+
29+
# Gradle cache directory
30+
.gradle/
31+
32+
# Autogenerated VS/MD/Consulo solution and project files
33+
ExportedObj/
34+
.consulo/
35+
*.csproj
36+
*.unityproj
37+
*.sln
38+
*.suo
39+
*.tmp
40+
*.user
41+
*.userprefs
42+
*.pidb
43+
*.booproj
44+
*.svd
45+
*.pdb
46+
*.mdb
47+
*.opendb
48+
*.VC.db
49+
50+
# Unity3D generated meta files
51+
*.pidb.meta
52+
*.pdb.meta
53+
*.mdb.meta
54+
55+
# Unity3D generated file on crash reports
56+
sysinfo.txt
57+
58+
# Builds
59+
*.apk
60+
*.aab
61+
*.unitypackage
62+
*.app
63+
64+
# Crashlytics generated file
65+
crashlytics-build.properties
66+
67+
# Packed Addressables
68+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
69+
70+
# Temporary auto-generated Android Assets
71+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
72+
/[Aa]ssets/[Ss]treamingAssets/aa/*
73+
74+
# macOS
75+
*.DS_Store
76+
77+
# External Dependency Manager resolved Android files
78+
BranchUnityTestBed/Assets/Plugins/Android/*
79+

AndroidThirdParty/.gitignore

Lines changed: 0 additions & 9 deletions
This file was deleted.

AndroidThirdParty/.idea/codeStyles/Project.xml

Lines changed: 0 additions & 113 deletions
This file was deleted.

AndroidThirdParty/.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

AndroidThirdParty/.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

AndroidThirdParty/.idea/gradle.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

AndroidThirdParty/.idea/misc.xml

Lines changed: 0 additions & 63 deletions
This file was deleted.

AndroidThirdParty/.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

AndroidThirdParty/.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

AndroidThirdParty/.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)