Add directive to switch to Unity Newtonsoft as well

Author: kirre-bylund

Runtime/Client/GetRequests.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
 using LootLocker.ZeroDepJson;
 #endif
 
@@ -8,7 +8,7 @@ namespace LootLocker.Requests
     public class LootLockerGetRequest
     {
 
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
         [Json(IgnoreWhenSerializing = true, IgnoreWhenDeserializing = true)]
         public List<string> getRequests = new List<string>();
 #else

Runtime/Client/LootLockerBaseServerAPI.cs

@@ -5,9 +5,12 @@
 using System;
 using System.Text;
 using System.Net;
-#if !USE_LOOTLOCKER_ZERODEPJSON
+#if !LOOTLOCKER_USE_ZERODEPJSON && !LOOTLOCKER_USE_NEWTONSOFTJSON
 using LLlibs.Newtonsoft.Json;
 using LLlibs.Newtonsoft.Json.Linq;
+#elif LOOTLOCKER_USE_NEWTONSOFTJSON
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 #endif
 using LootLocker.Requests;
 
@@ -368,7 +371,7 @@ public ObfuscationDetails(string key, char replacementChar = '*', int visibleCha
 
         private static string ObfuscateJsonStringForLogging(string json)
         {
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
             //TODO: Fix this json usage
             return json;
 #else

Runtime/Client/LootLockerServerRequest.cs

@@ -2,9 +2,12 @@
 using UnityEngine;
 using System;
 using LootLocker.LootLockerEnums;
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
 using LootLocker.ZeroDepJson;
-#else //USE_LOOTLOCKER_ZERODEPJSON
+#elif LOOTLOCKER_USE_NEWTONSOFTJSON
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+#else
 using LLlibs.Newtonsoft.Json.Serialization;
 using LLlibs.Newtonsoft.Json;
 #endif
@@ -18,9 +21,9 @@ namespace LootLocker
 
     public static class LootLockerJsonSettings
     {
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
         public static readonly JsonOptions Default = new JsonOptions(JsonSerializationOptions.Default & ~JsonSerializationOptions.SkipGetOnly);
-#else //USE_LOOTLOCKER_ZERODEPJSON
+#else //LOOTLOCKER_USE_ZERODEPJSON
         public static readonly JsonSerializerSettings Default = new JsonSerializerSettings
         {
             ContractResolver = new DefaultContractResolver { NamingStrategy = new SnakeCaseNamingStrategy() },
@@ -31,7 +34,7 @@ public static class LootLockerJsonSettings
 
     public static class LootLockerJson
     {
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
         public static string SerializeObject(object obj)
         {
             return SerializeObject(obj, LootLockerJsonSettings.Default);
@@ -51,7 +54,7 @@ public static T DeserializeObject<T>(string json, JsonOptions options)
         {
             return Json.Deserialize<T>(json, options ?? LootLockerJsonSettings.Default);
         }
-#else //USE_LOOTLOCKER_ZERODEPJSON
+#else //LOOTLOCKER_USE_ZERODEPJSON
         public static string SerializeObject(object obj)
         {
             return SerializeObject(obj, LootLockerJsonSettings.Default);
@@ -128,9 +131,9 @@ public class LootLockerResponse
         public string EventId { get; set; }
 
         public static void Deserialize<T>(Action<T> onComplete, LootLockerResponse serverResponse,
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
             JsonOptions options = null
-#else //USE_LOOTLOCKER_ZERODEPJSON
+#else //LOOTLOCKER_USE_ZERODEPJSON
       JsonSerializerSettings options = null
 #endif
             )
@@ -140,9 +143,9 @@ public static void Deserialize<T>(Action<T> onComplete, LootLockerResponse serve
         }
 
         public static T Deserialize<T>(LootLockerResponse serverResponse,
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
             JsonOptions options = null
-#else //USE_LOOTLOCKER_ZERODEPJSON
+#else //LOOTLOCKER_USE_ZERODEPJSON
             JsonSerializerSettings options = null
 #endif
             )

Runtime/Game/Requests/PlayerRequest.cs

@@ -1,7 +1,9 @@
 using System;
 using LootLocker.Requests;
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
 using LootLocker.ZeroDepJson;
+#elif LOOTLOCKER_USE_NEWTONSOFTJSON
+using Newtonsoft.Json;
 #else
 using LLlibs.Newtonsoft.Json;
 #endif
@@ -208,7 +210,7 @@ public class LootLockerPlayerFile : LootLockerResponse
         public int size { get; set; }
         public string purpose { get; set; }
 
-#if USE_LOOTLOCKER_ZERODEPJSON
+#if LOOTLOCKER_USE_ZERODEPJSON
         [Json(Name = "public")]
 #else
         [JsonProperty("public")]