Updating mobile workers (#42)

* updating mobile workers

* adding changelog

* update pinned version

* removing new line

* updated changelog

.buildkite/premerge.steps.yaml

@@ -31,13 +31,13 @@ common: &common
 # These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
 
 steps:
-  - label: "build :android:"
+  - label: "build :android: and iOS"
     command: bash -c .shared-ci/scripts/build-worker.sh
     <<: *common
     artifact_paths:
       - logs/**/*
     env:
-      WORKER_TYPE: "AndroidClient"
+      WORKER_TYPE: "MobileClient"
       BUILD_TARGET: "local"
       SCRIPTING_TYPE: "mono"
 

.buildkite/release-qa.steps.yaml

@@ -31,14 +31,14 @@ common: &common
 # These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
 
 steps:
-  - label: "build :android:"
+  - label: "build :android: and iOS"
     command: bash -c .shared-ci/scripts/build-worker.sh
     <<: *common
     artifact_paths:
       - logs/**/*
       - build/assembly/**/*
     env:
-      WORKER_TYPE: "AndroidClient"
+      WORKER_TYPE: "MobileClient"
       BUILD_TARGET: "local"
       SCRIPTING_TYPE: "mono"
 

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Breaking Changes
+- Removed the `AndroidClientWorkerConnector` and `iOSClientWorkerConnector` and their specific scenes. You can now use the `MobileClientWorkerConnector` and its `MobileClientScene` to connect to a mobile device.
+- Added the worker type `MobileClient` and removed the worker types `AndroidClient` and `iOSClient`.
+
 ## `0.2.1` - 2019-04-15
 
 ### Changed

cloud_launch.json

@@ -38,15 +38,7 @@
       ]
     },
     {
-      "worker_type": "AndroidClient",
-      "permissions": [
-        {
-          "all": {}
-        }
-      ]
-    },
-    {
-      "worker_type": "iOSClient",
+      "worker_type": "MobileClient",
       "permissions": [
         {
           "all": {}

default_launch.json

@@ -47,15 +47,7 @@
       ]
     },
     {
-      "worker_type": "AndroidClient",
-      "permissions": [
-        {
-          "all": {}
-        }
-      ]
-    },
-    {
-      "worker_type": "iOSClient",
+      "worker_type": "MobileClient",
       "permissions": [
         {
           "all": {}

gdk.pinned

@@ -1 +1 @@
-1ebe4a385826ee94189369781c5a79345b0401fd
+f88cb9df1dc7345fad505c692a33ebf1f5a5e1a1

workers/unity/Assets/BlankProject.asmdef

@@ -4,8 +4,6 @@
         "Improbable.Gdk.Core",
         "Improbable.Gdk.Generated",
         "Improbable.Gdk.Mobile",
-        "Improbable.Gdk.Mobile.Android",
-        "Improbable.Gdk.Mobile.iOS",
         "Improbable.Gdk.TransformSynchronization",
         "Improbable.Gdk.PlayerLifecycle",
         "Unity.Entities",

workers/unity/Assets/Config/BuildConfiguration.asset

@@ -81,7 +81,7 @@ MonoBehaviour:
       - Options: 0
         Enabled: 0
         Required: 0
-  - WorkerType: AndroidClient
+  - WorkerType: MobileClient
     ScenesForWorker:
     - {fileID: 102900000, guid: 17bd667c9bc89cf4b8c402299c7aa813, type: 3}
     LocalBuildConfig:
@@ -92,40 +92,6 @@ MonoBehaviour:
       - Options: 1
         Enabled: 1
         Required: 0
-      - Options: 0
-        Enabled: 0
-        Required: 0
-    CloudBuildConfig:
-      BuildTargets:
-      - Options: 0
-        Enabled: 0
-        Required: 0
-      - Options: 0
-        Enabled: 0
-        Required: 0
-      - Options: 16384
-        Enabled: 0
-        Required: 0
-      - Options: 0
-        Enabled: 0
-        Required: 0
-      - Options: 0
-        Enabled: 1
-        Required: 0
-      - Options: 0
-        Enabled: 0
-        Required: 0
-  - WorkerType: iOSClient
-    ScenesForWorker:
-    - {fileID: 102900000, guid: 41a2e6f1d4e756248b31ad0e94d13def, type: 3}
-    LocalBuildConfig:
-      BuildTargets:
-      - Options: 0
-        Enabled: 0
-        Required: 0
-      - Options: 0
-        Enabled: 0
-        Required: 0
       - Options: 1
         Enabled: 1
         Required: 0
@@ -144,7 +110,7 @@ MonoBehaviour:
         Enabled: 0
         Required: 0
       - Options: 0
-        Enabled: 0
+        Enabled: 1
         Required: 0
       - Options: 0
         Enabled: 1

workers/unity/Assets/Editor/SnapshotGenerator/SnapshotGenerator.cs

@@ -40,7 +40,7 @@ private static void AddPlayerSpawner(Snapshot snapshot)
             template.AddComponent(new Persistence.Snapshot(), serverAttribute);
             template.AddComponent(new PlayerCreator.Snapshot(), serverAttribute);
 
-            template.SetReadAccess(UnityClientConnector.WorkerType, UnityGameLogicConnector.WorkerType, AndroidClientWorkerConnector.WorkerType, iOSClientWorkerConnector.WorkerType);
+            template.SetReadAccess(UnityClientConnector.WorkerType, UnityGameLogicConnector.WorkerType, MobileClientWorkerConnector.WorkerType);
             template.SetComponentWriteAccess(EntityAcl.ComponentId, serverAttribute);
 
             snapshot.AddEntity(template);