Merge branch 'main' into develop

# Conflicts:
#	CHANGELOG.md

Author: SamuelBellomo

CHANGELOG.md

@@ -16,6 +16,10 @@ Additional documentation and release notes are available at [Multiplayer Documen
 ### Fixed
  * 
 
+## [2.0.2] - 2022-11-01
+### Fixed
+* Bumped Unity editor version to fix android build error (#779)
+
 ## [2.0.1] - 2022-10-25
 
 ### Changed

Packages/manifest.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.ai.navigation.components": "https://github.com/Unity-Technologies/NavMeshComponents.git#package",
-    "com.unity.cinemachine": "2.8.6",
+    "com.unity.cinemachine": "2.8.9",
     "com.unity.collab-proxy": "1.17.2",
     "com.unity.ide.rider": "3.0.15",
     "com.unity.ide.visualstudio": "2.0.16",
@@ -14,7 +14,7 @@
     "com.unity.performance.profile-analyzer": "1.1.1",
     "com.unity.postprocessing": "3.2.2",
     "com.unity.render-pipelines.universal": "12.1.7",
-    "com.unity.services.authentication": "2.1.1",
+    "com.unity.services.authentication": "2.2.0",
     "com.unity.services.lobby": "1.0.3",
     "com.unity.services.relay": "1.0.3",
     "com.unity.test-framework": "1.1.31",

Packages/packages-lock.json

@@ -25,10 +25,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.cinemachine": {
-      "version": "2.8.6",
+      "version": "2.8.9",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.test-framework": "1.1.31"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
@@ -215,19 +217,19 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.authentication": {
-      "version": "2.1.1",
+      "version": "2.2.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.services.core": "1.4.2",
+        "com.unity.services.core": "1.4.3",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.ugui": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.4.2",
+      "version": "1.4.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7682157600f735383d159043f09a6f399deecdff704392bfbe3a716eb1649375
-size 25451
+oid sha256:8945219216adb46586a4f9a1bbba347ad520e68e530042124625a4c891ebbf44
+size 25551

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.10f1
-m_EditorVersionWithRevision: 2021.3.10f1 (1c7d0df0160b)
+m_EditorVersion: 2021.3.12f1
+m_EditorVersionWithRevision: 2021.3.12f1 (8af3c3e441b1)