Merge pull request #153 from SpaceMadness/fix/unity-2020.x

Fixed Unity 2020.x compatibility
SpaceMadness · Dec 16, 2019 · 94b5382 · 94b5382
2 parents f3e32b1 + b3a7d60
commit 94b5382
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Lunar Console Changelog
 
+## v.1.6.4 - 12/15/2019
+
+**Fixes:**
+
+* Unity 2020.x incompatibility fix.
+
 ## v.1.6.3 - 11/3/2019
 
 **Fixes:**

diff --git a/Project/Assets/LunarConsole/Editor/AndroidPlugin.cs b/Project/Assets/LunarConsole/Editor/AndroidPlugin.cs
@@ -26,11 +26,17 @@
 
 using LunarConsolePluginInternal;
 
+#if UNITY_2020_1_OR_NEWER
+using CallbackFunction = System.Action;
+#else
+using CallbackFunction = UnityEditor.EditorApplication.CallbackFunction;
+#endif
+
 namespace LunarConsoleEditorInternal
 {
     static class AndroidPlugin
     {
-        private static EditorApplication.CallbackFunction s_onRetry;
+        private static CallbackFunction s_onRetry;
 
         public static void SetEnabled(bool enabled, bool retrying = false)
         {

diff --git a/Project/Assets/LunarConsole/Scripts/Constants.cs b/Project/Assets/LunarConsole/Scripts/Constants.cs
@@ -26,7 +26,7 @@ namespace LunarConsolePluginInternal
 {
     public static class Constants
     {
-        public static readonly string Version = "1.6.3";
+        public static readonly string Version = "1.6.4";
         public static readonly string UpdateJsonURLFull = "https://raw.githubusercontent.com/SpaceMadness/lunar-unity-console/master/Builder/updater-full.json";
         public static readonly string UpdateJsonURLFree = "https://raw.githubusercontent.com/SpaceMadness/lunar-unity-console/master/Builder/updater-free.json";