Skip to content

Commit d78ec8c

Browse files
jgimenezjgimenez
authored
Merge pull request #1 from bugfender/android3.0.16-iOS1.10.5
Update to Unity 2021.3 and Android SDK 3.0.16 and fix iOS import
2 parents de7aaa8 + 07e2a96 commit d78ec8c

15 files changed

Lines changed: 347 additions & 111 deletions

‎.gitignore‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
# This .gitignore file should be placed at the root of your Unity project directory
22
#
3-
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
3+
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
44
#
55
/[Ll]ibrary/
66
/[Tt]emp/
77
/[Oo]bj/
88
/[Bb]uild/
99
/[Bb]uilds/
1010
/[Ll]ogs/
11+
/[Uu]ser[Ss]ettings/
12+
13+
# MemoryCaptures can get excessive in size.
14+
# They also could contain extremely sensitive data
1115
/[Mm]emoryCaptures/
1216

13-
# Asset meta data should only be ignored when the corresponding asset is also ignored
14-
!/[Aa]ssets/**/*.meta
17+
# Recordings can get excessive in size
18+
/[Rr]ecordings/
1519

1620
# Uncomment this line if you wish to ignore the asset store tools plugin
1721
# /[Aa]ssets/AssetStoreTools*
1822

1923
# Autogenerated Jetbrains Rider plugin
20-
[Aa]ssets/Plugins/Editor/JetBrains*
24+
/[Aa]ssets/Plugins/Editor/JetBrains*
2125

2226
# Visual Studio cache directory
2327
.vs/
@@ -53,10 +57,16 @@ sysinfo.txt
5357

5458
# Builds
5559
*.apk
60+
*.aab
5661
*.unitypackage
62+
*.app
5763

5864
# Crashlytics generated file
5965
crashlytics-build.properties
6066

61-
# iOS project
62-
iOSTestApp
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/*

‎Assets/Plugins/Android/android-3.0.11.aar‎

-177 KB
Binary file not shown.

‎Assets/Plugins/Android/android-3.0.16.aar‎

181 KB
Binary file not shown.

Assets/Plugins/Android/android-3.0.11.aar.meta renamed to Assets/Plugins/Android/android-3.0.16.aar.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Plugins/iOS/BugfenderSDK.h.meta‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Plugins/iOS/libBugfenderSDK.a.meta‎

Lines changed: 47 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Packages/manifest.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"dependencies": {
3-
"com.unity.2d.animation": "4.2.5",
4-
"com.unity.2d.pixel-perfect": "3.0.2",
5-
"com.unity.2d.psdimporter": "3.1.5",
3+
"com.unity.2d.animation": "7.0.6",
4+
"com.unity.2d.pixel-perfect": "5.0.1",
5+
"com.unity.2d.psdimporter": "6.0.4",
66
"com.unity.2d.sprite": "1.0.0",
7-
"com.unity.2d.spriteshape": "4.1.3",
7+
"com.unity.2d.spriteshape": "7.0.4",
88
"com.unity.2d.tilemap": "1.0.0",
9-
"com.unity.collab-proxy": "1.3.9",
10-
"com.unity.ide.rider": "1.2.1",
11-
"com.unity.ide.visualstudio": "2.0.2",
12-
"com.unity.ide.vscode": "1.2.1",
13-
"com.unity.test-framework": "1.1.16",
14-
"com.unity.textmeshpro": "3.0.1",
15-
"com.unity.timeline": "1.3.5",
9+
"com.unity.collab-proxy": "1.15.18",
10+
"com.unity.ide.rider": "3.0.15",
11+
"com.unity.ide.visualstudio": "2.0.16",
12+
"com.unity.ide.vscode": "1.2.5",
13+
"com.unity.test-framework": "1.1.31",
14+
"com.unity.textmeshpro": "3.0.6",
15+
"com.unity.timeline": "1.6.4",
1616
"com.unity.ugui": "1.0.0",
1717
"com.unity.modules.ai": "1.0.0",
1818
"com.unity.modules.androidjni": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 64 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
11
{
22
"dependencies": {
33
"com.unity.2d.animation": {
4-
"version": "4.2.5",
4+
"version": "7.0.6",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.2d.common": "3.0.1",
9-
"com.unity.mathematics": "1.1.0",
8+
"com.unity.2d.common": "6.0.3",
109
"com.unity.2d.sprite": "1.0.0",
1110
"com.unity.modules.animation": "1.0.0",
1211
"com.unity.modules.uielements": "1.0.0"
1312
},
1413
"url": "https://packages.unity.com"
1514
},
1615
"com.unity.2d.common": {
17-
"version": "3.0.1",
16+
"version": "6.0.3",
1817
"depth": 1,
1918
"source": "registry",
2019
"dependencies": {
2120
"com.unity.2d.sprite": "1.0.0",
22-
"com.unity.modules.uielements": "1.0.0"
21+
"com.unity.mathematics": "1.1.0",
22+
"com.unity.modules.uielements": "1.0.0",
23+
"com.unity.burst": "1.5.1"
2324
},
2425
"url": "https://packages.unity.com"
2526
},
2627
"com.unity.2d.path": {
27-
"version": "3.0.2",
28+
"version": "5.0.2",
2829
"depth": 1,
2930
"source": "registry",
3031
"dependencies": {},
3132
"url": "https://packages.unity.com"
3233
},
3334
"com.unity.2d.pixel-perfect": {
34-
"version": "3.0.2",
35+
"version": "5.0.1",
3536
"depth": 0,
3637
"source": "registry",
3738
"dependencies": {},
3839
"url": "https://packages.unity.com"
3940
},
4041
"com.unity.2d.psdimporter": {
41-
"version": "3.1.5",
42+
"version": "6.0.4",
4243
"depth": 0,
4344
"source": "registry",
4445
"dependencies": {
45-
"com.unity.2d.common": "3.0.1",
46-
"com.unity.2d.animation": "4.2.5",
46+
"com.unity.2d.animation": "7.0.6",
47+
"com.unity.2d.common": "6.0.3",
4748
"com.unity.2d.sprite": "1.0.0"
4849
},
4950
"url": "https://packages.unity.com"
@@ -55,13 +56,13 @@
5556
"dependencies": {}
5657
},
5758
"com.unity.2d.spriteshape": {
58-
"version": "4.1.3",
59+
"version": "7.0.4",
5960
"depth": 0,
6061
"source": "registry",
6162
"dependencies": {
6263
"com.unity.mathematics": "1.1.0",
63-
"com.unity.2d.common": "3.0.1",
64-
"com.unity.2d.path": "3.0.2",
64+
"com.unity.2d.common": "6.0.3",
65+
"com.unity.2d.path": "5.0.2",
6566
"com.unity.modules.physics2d": "1.0.0"
6667
},
6768
"url": "https://packages.unity.com"
@@ -72,63 +73,94 @@
7273
"source": "builtin",
7374
"dependencies": {}
7475
},
76+
"com.unity.burst": {
77+
"version": "1.6.6",
78+
"depth": 2,
79+
"source": "registry",
80+
"dependencies": {
81+
"com.unity.mathematics": "1.2.1"
82+
},
83+
"url": "https://packages.unity.com"
84+
},
7585
"com.unity.collab-proxy": {
76-
"version": "1.3.9",
86+
"version": "1.15.18",
7787
"depth": 0,
7888
"source": "registry",
79-
"dependencies": {},
89+
"dependencies": {
90+
"com.unity.services.core": "1.0.1"
91+
},
8092
"url": "https://packages.unity.com"
8193
},
8294
"com.unity.ext.nunit": {
83-
"version": "1.0.0",
95+
"version": "1.0.6",
8496
"depth": 1,
8597
"source": "registry",
8698
"dependencies": {},
8799
"url": "https://packages.unity.com"
88100
},
89101
"com.unity.ide.rider": {
90-
"version": "1.2.1",
102+
"version": "3.0.15",
91103
"depth": 0,
92104
"source": "registry",
93105
"dependencies": {
94-
"com.unity.test-framework": "1.1.1"
106+
"com.unity.ext.nunit": "1.0.6"
95107
},
96108
"url": "https://packages.unity.com"
97109
},
98110
"com.unity.ide.visualstudio": {
99-
"version": "2.0.2",
111+
"version": "2.0.16",
100112
"depth": 0,
101113
"source": "registry",
102-
"dependencies": {},
114+
"dependencies": {
115+
"com.unity.test-framework": "1.1.9"
116+
},
103117
"url": "https://packages.unity.com"
104118
},
105119
"com.unity.ide.vscode": {
106-
"version": "1.2.1",
120+
"version": "1.2.5",
107121
"depth": 0,
108122
"source": "registry",
109123
"dependencies": {},
110124
"url": "https://packages.unity.com"
111125
},
112126
"com.unity.mathematics": {
113-
"version": "1.1.0",
127+
"version": "1.2.6",
114128
"depth": 1,
115129
"source": "registry",
116130
"dependencies": {},
117131
"url": "https://packages.unity.com"
118132
},
133+
"com.unity.nuget.newtonsoft-json": {
134+
"version": "3.0.2",
135+
"depth": 2,
136+
"source": "registry",
137+
"dependencies": {},
138+
"url": "https://packages.unity.com"
139+
},
140+
"com.unity.services.core": {
141+
"version": "1.4.0",
142+
"depth": 1,
143+
"source": "registry",
144+
"dependencies": {
145+
"com.unity.modules.unitywebrequest": "1.0.0",
146+
"com.unity.nuget.newtonsoft-json": "3.0.2",
147+
"com.unity.modules.androidjni": "1.0.0"
148+
},
149+
"url": "https://packages.unity.com"
150+
},
119151
"com.unity.test-framework": {
120-
"version": "1.1.16",
152+
"version": "1.1.31",
121153
"depth": 0,
122154
"source": "registry",
123155
"dependencies": {
124-
"com.unity.ext.nunit": "1.0.0",
156+
"com.unity.ext.nunit": "1.0.6",
125157
"com.unity.modules.imgui": "1.0.0",
126158
"com.unity.modules.jsonserialize": "1.0.0"
127159
},
128160
"url": "https://packages.unity.com"
129161
},
130162
"com.unity.textmeshpro": {
131-
"version": "3.0.1",
163+
"version": "3.0.6",
132164
"depth": 0,
133165
"source": "registry",
134166
"dependencies": {
@@ -137,10 +169,15 @@
137169
"url": "https://packages.unity.com"
138170
},
139171
"com.unity.timeline": {
140-
"version": "1.3.5",
172+
"version": "1.6.4",
141173
"depth": 0,
142174
"source": "registry",
143-
"dependencies": {},
175+
"dependencies": {
176+
"com.unity.modules.director": "1.0.0",
177+
"com.unity.modules.animation": "1.0.0",
178+
"com.unity.modules.audio": "1.0.0",
179+
"com.unity.modules.particlesystem": "1.0.0"
180+
},
144181
"url": "https://packages.unity.com"
145182
},
146183
"com.unity.ugui": {

0 commit comments

Comments
 (0)