Support for 2019.1.9

mob-sakai · Nov 21, 2019 · 3de2f36 · 3de2f36
1 parent a40a32d
commit 3de2f36
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 23 deletions.
diff --git a/Packages/com.coffee.internal-accessible/Editor/InternalAccessible.cs b/Packages/com.coffee.internal-accessible/Editor/InternalAccessible.cs
@@ -1,4 +1,7 @@
-using System.Linq;
+#if UNITY_2019_1_9 || UNITY_2019_1_10 || UNITY_2019_1_11 || UNITY_2019_1_12 || UNITY_2019_1_13 || UNITY_2019_1_14 || UNITY_2019_2_OR_NEWER
+#define UNITY_2019_1_9_OR_NEWER
+#endif
+using System.Linq;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using UnityEditor;
@@ -163,12 +166,12 @@ static void DevelopBridge()
                 "Packages/com.coffee.upm-git-extension/Editor/InternalBridge/Coffee.UpmGitExtension.Editor.Bridge.asmdef"
             };
 
-#if UNITY_2019_2_OR_NEWER
+#if UNITY_2019_1_9_OR_NEWER
             const string suffix = ".2019.2~";
 #else
-            const string suffix = ".2018.3~";
+			const string suffix = ".2018.3~";
 #endif
-            foreach(var t in targets)
+			foreach (var t in targets)
             {
                 File.Copy(t + suffix, t, true);
             }
@@ -182,22 +185,22 @@ static void CompileBridge()
             s_MiSyncSolution.Invoke(null, new object[0]);
 
             CompileCsproj(
-#if UNITY_2019_2_OR_NEWER
-                "Unity.InternalAPIEditorBridgeDev.001.csproj",
+#if UNITY_2019_1_9_OR_NEWER
+				"Unity.InternalAPIEditorBridgeDev.001.csproj",
 #else
                 "Unity.PackageManagerCaptain.Editor.csproj",
 #endif
 
 #if UNITY_2019_3_OR_NEWER
                 "Packages/com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.3.dll"
-#elif UNITY_2019_2_OR_NEWER
-                "Packages/com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.2.dll"
+#elif UNITY_2019_1_9_OR_NEWER
+				"Packages/com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.2.dll"
 #elif UNITY_2019_1_OR_NEWER
                 "Packages/com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.1.dll"
 #else
                 "Packages/com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2018.3.dll"
 #endif
-            );
+			);
         }
     }
 }
diff --git a/.../com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.1.dll.meta b/.../com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.1.dll.meta
diff --git a/Packages/com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.2.dll b/Packages/com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.2.dll
diff --git a/.../com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.2.dll.meta b/.../com.coffee.upm-git-extension/Editor/Coffee.UpmGitExtension.Editor.Bridge.2019.2.dll.meta
diff --git a/Packages/com.coffee.upm-git-extension/Editor/InternalBridge/InternalBridge.cs b/Packages/com.coffee.upm-git-extension/Editor/InternalBridge/InternalBridge.cs
@@ -1,4 +1,7 @@
-using System;
+#if UNITY_2019_1_9 || UNITY_2019_1_10 || UNITY_2019_1_11 || UNITY_2019_1_12 || UNITY_2019_1_13 || UNITY_2019_1_14 || UNITY_2019_2_OR_NEWER
+#define UNITY_2019_1_9_OR_NEWER
+#endif
+using System;
 using System.Text;
 using System.Linq;
 using System.Collections;
@@ -8,7 +11,7 @@
 using System.Text.RegularExpressions;
 using System.IO;
 using System.Runtime.CompilerServices;
-#if !UNITY_2019_2_OR_NEWER
+#if !UNITY_2019_1_9_OR_NEWER
 using Semver;
 #endif
 #if UNITY_2019_1_OR_NEWER
@@ -32,7 +35,7 @@ public class Bridge
 
         bool reloading;
 
-        LoadingSpinner GetLoadingSpinner() { return loadingSpinner as LoadingSpinner; }
+		LoadingSpinner GetLoadingSpinner () { return loadingSpinner as LoadingSpinner; }
         PackageList GetPackageList() { return packageList as PackageList; }
         PackageDetails GetPackageDetails() { return packageDetails as PackageDetails; }
 
@@ -341,11 +344,10 @@ void UpdatePackageVersions(Package package, IEnumerable<string> versions)
                     var newPInfo = JsonUtility.FromJson(json, typeof(PackageInfo)) as PackageInfo;
 
                     newPInfo.Version = SemVersion.Parse(version == refName ? version : version + "-" + refName);
-#if UNITY_2019_2_OR_NEWER
-                    newPInfo.IsInstalled = false;
-#else
-                    newPInfo.IsCurrent = false;
-#endif
+
+                    var exPackageInfo = Expose.FromObject(newPInfo);
+                    exPackageInfo.Set(exPackageInfo.Has("IsInstalled") ? "IsInstalled" : "IsCurrent", false);
+
                     newPInfo.IsVerified = false;
                     newPInfo.Origin = (PackageSource)99;
                     newPInfo.Info = pInfo.Info;

diff --git a/Packages/com.coffee.upm-git-extension/Editor/InternalBridge/Utils.cs b/Packages/com.coffee.upm-git-extension/Editor/InternalBridge/Utils.cs
@@ -1,4 +1,7 @@
-#if UNITY_2019_1_OR_NEWER
+#if UNITY_2019_1_9 || UNITY_2019_1_10 || UNITY_2019_1_11 || UNITY_2019_1_12 || UNITY_2019_1_13 || UNITY_2019_1_14 || UNITY_2019_2_OR_NEWER
+#define UNITY_2019_1_9_OR_NEWER
+#endif
+#if UNITY_2019_1_OR_NEWER
 using UnityEngine.UIElements;
 #else
 using UnityEngine.Experimental.UIElements;
@@ -187,16 +190,16 @@ public static class JsonUtils
         public static Dictionary<string, object> DeserializeFile(string file)
         {
             var text = File.ReadAllText(file);
-#if UNITY_2019_2_OR_NEWER
-            return Json.Deserialize(text) as Dictionary<string, object>;
+#if UNITY_2019_1_9_OR_NEWER
+			return Json.Deserialize(text) as Dictionary<string, object>;
 #else
             return Expose.FromType(Type.GetType("UnityEditor.Json, UnityEditor")).Call("Deserialize", text).As<Dictionary<string, object>>();
 #endif
         }
 
         public static void SerializeFile(string file, Dictionary<string, object> json)
         {
-#if UNITY_2019_2_OR_NEWER
+#if UNITY_2019_1_9_OR_NEWER
 			var text = Json.Serialize(json);
 #elif UNITY_2019_1_OR_NEWER
             var text = Expose.FromType(Type.GetType("UnityEditor.Json, UnityEditor")).Call("Serialize", json, false, "  ").As<string>();