14.0.1 upgrade (#69)

Author: Jamie Brynes

CHANGELOG.md

@@ -17,6 +17,10 @@
 
 - The **SpatialOS** > **Generate snapshot** button now generates a snapshot directly without displaying a pop-up window. [#68](https://github.com/spatialos/gdk-for-unity-blank-project/pull/68)
 
+### Internal
+
+- Removed old arguments from the worker JSON files. [#69](https://github.com/spatialos/gdk-for-unity-blank-project/pull/69)
+
 ## `0.2.6` - 2019-08-05
 
 ### Changed

gdk.pinned

@@ -1 +1 @@
-e31c47b5050ee67cafe8962204aa86a259095db0
+618c28ce0a3d13d17859aab25d8818ca159f4c6c

spatialos.json

@@ -1,8 +1,8 @@
 {
     "name": "unity_gdk",
     "project_version": "0.0.1",
-    "sdk_version": "13.8.2",
+    "sdk_version": "14.0.1",
     "dependencies": [
-        {"name": "standard_library", "version": "13.8.2"}
+        {"name": "standard_library", "version": "14.0.1"}
     ]
 }

workers/unity/Assets/BlankProject/Scripts/Workers/MobileClientWorkerConnector.cs

@@ -32,8 +32,8 @@ public async void Start()
                     builder.SetConnectionFlow(new ReceptionistFlow(CreateNewWorkerId(WorkerType),
                         flowInitializer));
                     break;
-                case ConnectionService.AlphaLocator:
-                    builder.SetConnectionFlow(new AlphaLocatorFlow(flowInitializer));
+                case ConnectionService.Locator:
+                    builder.SetConnectionFlow(new LocatorFlow(flowInitializer));
                     break;
                 default:
                     throw new ArgumentException("Received unsupported connection service.");

workers/unity/Assets/BlankProject/Scripts/Workers/UnityClientConnector.cs

@@ -29,9 +29,6 @@ private async void Start()
                     case ConnectionService.Locator:
                         builder.SetConnectionFlow(new LocatorFlow(initializer));
                         break;
-                    case ConnectionService.AlphaLocator:
-                        builder.SetConnectionFlow(new AlphaLocatorFlow(initializer));
-                        break;
                     default:
                         throw new ArgumentOutOfRangeException();
                 }

workers/unity/spatialos.UnityClient.worker.json

@@ -39,10 +39,6 @@
         "arguments": [
           "+workerType",
           "UnityClient",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-logfile",
           "../../logs/external-default-unityclient.log"
         ]
@@ -53,14 +49,8 @@
           "-n",
           "./build/worker/UnityClient@Mac/[email protected]",
           "--args",
-          "+assemblyName",
-          "local_assembly",
           "+workerType",
           "UnityClient",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-logfile",
           "../../logs/external-default-unityclient.log"
         ]

workers/unity/spatialos.UnityGameLogic.worker.json

@@ -39,10 +39,6 @@
         "arguments": [
           "+workerType",
           "UnityGameLogic",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-batchmode",
           "-nographics",
           "-logfile",
@@ -55,14 +51,8 @@
           "-n",
           "./build/worker/UnityGameLogic@Mac/[email protected]",
           "--args",
-          "+assemblyName",
-          "local_assembly",
           "+workerType",
           "UnityGameLogic",
-          "+infraServicesUrl",
-          "http://127.0.0.1:21000",
-          "+projectName",
-          "${IMPROBABLE_PROJECT_NAME}",
           "-batchmode",
           "-nographics",
           "-logfile",
@@ -80,14 +70,12 @@
         "UnityGameLogic",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",
@@ -102,14 +90,12 @@
         "UnityGameLogic",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",
@@ -124,14 +110,12 @@
         "UnityGameLogic",
         "+workerId",
         "${IMPROBABLE_WORKER_ID}",
-        "+projectName",
-        "${IMPROBABLE_PROJECT_NAME}",
         "+receptionistHost",
         "${IMPROBABLE_RECEPTIONIST_HOST}",
         "+receptionistPort",
         "${IMPROBABLE_RECEPTIONIST_PORT}",
         "+linkProtocol",
-        "RakNet",
+        "Tcp",
         "-batchmode",
         "-nographics",
         "-logfile",