Fixing package resolution

mzaks · Nov 21, 2019 · e20cfcb · e20cfcb
1 parent c82a871
commit e20cfcb
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/Editor/FlexBufferBrowser.cs b/Editor/FlexBufferBrowser.cs
@@ -4,6 +4,7 @@
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
+using FlexBuffers;
 
 public class FlexBufferTreeWindow : EditorWindow
 {
@@ -58,7 +59,7 @@ void OnGUI ()
         _treeView?.OnGUI(new Rect(0, 80, position.width, position.height - 80));
     }
 
-    [MenuItem("Assets/FlexBuffer Browser")]
+    [MenuItem("Tools/FlexBuffers/FlexBuffer Browser")]
     static void ShowWidnow()
     {
         var window = GetWindow<FlexBufferTreeWindow> ();

diff --git a/Editor/FlxQuery.cs b/Editor/FlxQuery.cs
@@ -1,4 +1,4 @@
-using UnityEngine.Video;
+using FlexBuffers;
 
 namespace FlexBuffers
 {

diff --git a/Editor/FlxQueryParser.cs b/Editor/FlxQueryParser.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Runtime.Remoting.Contexts;
 using System.Text;
 using JetBrains.Annotations;
-using UnityEditor.OSXStandalone;
+using FlexBuffers;
 
 namespace FlexBuffers
 {

diff --git a/Editor/ImportAsFlexBuffer.cs b/Editor/ImportAsFlexBuffer.cs
@@ -1,11 +1,10 @@
 using System.IO;
 using FlexBuffers;
 using UnityEditor;
-using UnityEngine;
 
 public static class ImportAsFlexBuffer
 {
-    [MenuItem("Assets/JSON as FlexBuffer...")]
+    [MenuItem("Tools/FlexBuffers/JSON as FlexBuffer...")]
     static void ImportJson()
     {
         string jsonPath = EditorUtility.OpenFilePanel("Select JSON file", "", "json");
@@ -34,7 +33,7 @@ static void ImportJson()
         }
     }
 
-    [MenuItem("Assets/CSV as FlexBuffer...")]
+    [MenuItem("Tools/FlexBuffers/CSV as FlexBuffer...")]
     static void ImportCsv()
     {
         string csvPath = EditorUtility.OpenFilePanel("Select CSV file", "", "csv");
@@ -65,7 +64,7 @@ static void ImportCsv()
         }
     }
 
-    [MenuItem("Assets/XML as FlexBuffer...")]
+    [MenuItem("Tools/FlexBuffers/XML as FlexBuffer...")]
     static void ImportXML()
     {
         string xmlPath = EditorUtility.OpenFilePanel("Select XML file", "", "xml");

diff --git a/Editor/Unity.FlexBuffers.Editor.asmdef b/Editor/Unity.FlexBuffers.Editor.asmdef
@@ -1,7 +1,11 @@
 {
     "name": "FlexBuffersEditor",
-    "references": [],
-    "includePlatforms": [],
+    "references": [
+        "GUID:1a82e366e6a014b228ca1f953480ed08"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,

diff --git a/Runtime/FlexBuffer.cs b/Runtime/FlexBuffer.cs
@@ -339,7 +339,7 @@ private void AddDynamicVector(IEnumerable values)
             var start = StartVector();
             var typed = true;
             var prevType = -1;
-            foreach (dynamic value in values)
+            foreach (object value in values)
             {
                 var currentType = this.AddDynamic(value);
 
@@ -496,7 +496,7 @@ private bool ShouldFlip(StackValue v1, StackValue v2)
             return false;
         }
 
-        private Type AddDynamic(dynamic value)
+        private Type AddDynamic(object value)
         {
             switch (value)
             {

diff --git a/package.json b/package.json
@@ -10,6 +10,6 @@
   "author": {
     "name": "Maxim Zaks",
     "email": "[email protected]",
-    "url": "https://github.com/mzaks/FlexBuffersUnity"
+    "url": "https://github.com/mzaks"
   }
 }