Worker sdk upgrade (#1208)

* Update init script to get sdk version from separate file

* Update versioning scheme of Worker SDK packages

* Update shared-ci.pinned temp, supporting worker sdk versioning change

* Upgrade Worker SDK to 14.1.0

* Upgrade to 14.2.1

* Changelog

Author: zeroZshadow

CHANGELOG.md

@@ -15,6 +15,8 @@
 ### Changed
 
 - Generated Worker ID's for local development are now smaller and easier to read for debugging. [#1197](https://github.com/spatialos/gdk-for-unity/pull/1197)
+- Upgraded to Worker SDK 14.2.1. [#1208](https://github.com/spatialos/gdk-for-unity/pull/1208)
+  - Versioning scheme for the SDK and Mobile SDK packages have now changed to align with the GDK for Unity version.
 
 ### Fixed
 

ci/shared-ci.pinned

@@ -1 +1 @@
-master 16af8b4696032d897ba4d8075eaa61355f06f488
+master a6c1fcd9562bf40160214acddc7e1a732a66faf4

init.ps1

@@ -5,7 +5,7 @@ $SdkPath = $PkgRoot + "/io.improbable.worker.sdk"
 $SdkMobilePath = $PkgRoot + "/io.improbable.worker.sdk.mobile"
 $TestSdkPath="test-project/Packages/io.improbable.worker.sdk.testschema"
 
-$SdkVersion = Get-Content ($SdkPath + "/package.json") | jq -r '.version'
+$SdkVersion = Get-Content ($SdkPath + "/.sdk.version")
 $SpotVersion = Get-Content ($SdkPath + "/.spot.version")
 
 function UpdatePackage($type, $identifier, $path, $removes)

init.sh

@@ -8,7 +8,7 @@ SDK_PATH="${PKG_ROOT}/io.improbable.worker.sdk"
 SDK_MOBILE_PATH="${PKG_ROOT}/io.improbable.worker.sdk.mobile"
 TEST_SDK_PATH="test-project/Packages/io.improbable.worker.sdk.testschema"
 
-SDK_VERSION="$(cat "${SDK_PATH}"/package.json | jq -r '.version')"
+SDK_VERSION="$(cat "${SDK_PATH}"/.sdk.version)"
 SPOT_VERSION="$(cat "${SDK_PATH}"/.spot.version)"
 
 update_package() {
@@ -36,7 +36,7 @@ update_package worker_sdk c-dynamic-x86_64-gcc510-linux "${SDK_PATH}/Plugins/Imp
 update_package worker_sdk c-bundle-x86_64-clang-macos "${SDK_PATH}/Plugins/Improbable/Core/OSX"
 update_package worker_sdk c-dynamic-x86_64-vc140_mt-win32 "${SDK_PATH}/Plugins/Improbable/Core/Windows/x86_64" "improbable_worker.lib"
 
-update_package worker_sdk csharp_cinterop "${SDK_PATH}/Plugins/Improbable/Sdk/Common" "Improbable.Worker.CInterop.pdb"
+update_package worker_sdk csharp_cinterop "${SDK_PATH}/Plugins/Improbable/Sdk/Common"
 
 update_package schema standard_library "${SDK_PATH}/.schema"
 update_package schema test_schema_library "${TEST_SDK_PATH}/.schema"
@@ -48,11 +48,11 @@ update_spot spot-win64 "${SDK_PATH}/.spot/spot.exe"
 update_spot spot-macos "${SDK_PATH}/.spot/spot"
 
 #Update Mobile SDK
-update_package worker_sdk c-static-fullylinked-arm-clang-ios "${SDK_MOBILE_PATH}/Plugins/Improbable/Core/iOS/arm" "improbable_worker_static.lib;libimprobable_worker_static.a.pic"
-update_package worker_sdk c-static-fullylinked-x86_64-clang-ios "${SDK_MOBILE_PATH}/Plugins/Improbable/Core/iOS/x86_64" "improbable_worker_static.lib;libimprobable_worker_static.a.pic"
+update_package worker_sdk c-static-fullylinked-arm-clang-ios "${SDK_MOBILE_PATH}/Plugins/Improbable/Core/iOS/arm" "libimprobable_worker_static.a.pic"
+update_package worker_sdk c-static-fullylinked-x86_64-clang-ios "${SDK_MOBILE_PATH}/Plugins/Improbable/Core/iOS/x86_64" "libimprobable_worker_static.a.pic"
 
 update_package worker_sdk c-dynamic-arm64v8a-clang_ndk16b-android "${SDK_MOBILE_PATH}/Plugins/Improbable/Core/Android/arm64"
 update_package worker_sdk c-dynamic-armv7a-clang_ndk16b-android "${SDK_MOBILE_PATH}/Plugins/Improbable/Core/Android/armv7"
 update_package worker_sdk c-dynamic-x86-clang_ndk16b-android "${SDK_MOBILE_PATH}/Plugins/Improbable/Core/Android/x86"
 
-update_package worker_sdk csharp_cinterop_static "${SDK_MOBILE_PATH}/Plugins/Improbable/Sdk/iOS" "Improbable.Worker.CInteropStatic.pdb"
+update_package worker_sdk csharp_cinterop_static "${SDK_MOBILE_PATH}/Plugins/Improbable/Sdk/iOS"

spatialos.json

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

workers/unity/Packages/io.improbable.gdk.core/package.json

@@ -6,7 +6,7 @@
   "author": "Improbable Worlds Ltd",
   "description": "SpatialOS GDK Core Module.",
   "dependencies": {
-    "io.improbable.worker.sdk": "14.0.2",
+    "io.improbable.worker.sdk": "0.2.10",
     "io.improbable.gdk.tools": "0.2.10",
     "io.improbable.gdk.testutils": "0.2.10",
     "com.unity.entities": "0.1.1-preview"

workers/unity/Packages/io.improbable.gdk.mobile/package.json

@@ -7,7 +7,7 @@
   "description": "SpatialOS GDK Mobile Support Module.",
   "dependencies": {
     "io.improbable.gdk.core": "0.2.10",
-    "io.improbable.worker.sdk.mobile": "14.0.2",
+    "io.improbable.worker.sdk.mobile": "0.2.10",
     "com.unity.modules.androidjni": "1.0.0"
   }
 }

workers/unity/Packages/io.improbable.worker.sdk.mobile/package.json

@@ -1,11 +1,11 @@
 {
   "name": "io.improbable.worker.sdk.mobile",
   "displayName": "SpatialOS Worker Mobile SDK",
-  "version": "14.0.2",
+  "version": "0.2.10",
   "unity": "2019.2",
   "author": "Improbable Worlds Ltd",
   "description": "SpatialOS Worker Mobile SDK.",
   "dependencies": {
-    "io.improbable.worker.sdk": "14.0.2"
+    "io.improbable.worker.sdk": "0.2.10"
   }
 }

workers/unity/Packages/io.improbable.worker.sdk/.sdk.version

@@ -0,0 +1 @@
+14.2.1

workers/unity/Packages/io.improbable.worker.sdk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "io.improbable.worker.sdk",
   "displayName": "SpatialOS Worker SDK",
-  "version": "14.0.2",
+  "version": "0.2.10",
   "unity": "2019.2",
   "author": "Improbable Worlds Ltd",
   "description": "SpatialOS Worker SDK.",