Merge pull request #42 from rfadeev/41-pbxsourcetree-type-compilation-errors-when-ios-build-support-module-is-not-installed

Resolve "PBXSourceTree type compilation errors when iOS Build Support module is not installed"

Author: skjalgsm

Assets/Stickers/Editor/StickerEditor.cs

@@ -1,15 +1,15 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using UnityEditor;
 using UnityEngine;
+using Agens.Stickers;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     [CustomEditor(typeof(Sticker))]
-    public class StickerEditor : UnityEditor.Editor
+    public class StickerEditor : Editor
     {
         private SerializedProperty Frames;
         private SerializedProperty Sequence;
@@ -19,12 +19,12 @@ public class StickerEditor : UnityEditor.Editor
 
         private static GUIContent[] s_PlayIcons = new GUIContent[2];
 
-        private List<UnityEditor.Editor> textureEditors;
+        private List<Editor> textureEditors;
 
         private MethodInfo RepaintMethod;
         private object GUIView;
 
-        private UnityEditor.Editor currentTextureEditor
+        private Editor currentTextureEditor
         {
             get
             {
@@ -173,7 +173,7 @@ public override void OnInteractivePreviewGUI(Rect r, GUIStyle background)
             {
                 if (RepaintMethod == null)
                 {
-                    var type = typeof(UnityEditor.Editor).Assembly.GetType("UnityEditor.GUIView");
+                    var type = typeof(Editor).Assembly.GetType("UnityEditor.GUIView");
                     var prop = type.GetProperty("current", BindingFlags.Static | BindingFlags.Public);
                     GUIView = prop.GetValue(null, null);
                     RepaintMethod = GUIView.GetType().GetMethod("Repaint", BindingFlags.Public | BindingFlags.Instance);
@@ -203,7 +203,7 @@ private void CreateTextureEditor()
         {
             var sticker = serializedObject;
             var frames = sticker.FindProperty("Frames");
-            textureEditors = new List<UnityEditor.Editor>(frames.arraySize);
+            textureEditors = new List<Editor>(frames.arraySize);
             for (int i = 0; i < frames.arraySize; i++)
             {
                 var firstFrame = frames.GetArrayElementAtIndex(i);

Assets/Stickers/Editor/StickerEditorUtility.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     public static class StickerEditorUtility
     {

Assets/Stickers/Editor/StickerPackEditor.cs

@@ -1,21 +1,21 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using UnityEditor;
 using UnityEditor.AnimatedValues;
 using UnityEditorInternal;
 using UnityEngine;
+using Agens.Stickers;
 using Object = UnityEngine.Object;
 #if UNITY_5_5_OR_NEWER
 using UnityEngine.Profiling;
 #endif
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     [CustomEditor(typeof(StickerPack))]
-    public class StickerPackEditor : UnityEditor.Editor
+    public class StickerPackEditor : Editor
     {
 
         public static readonly int[] ValidSizes = new int[3] {300, 408, 618};
@@ -648,7 +648,7 @@ private void RepaintView()
         {
             if (repaintMethod == null)
             {
-                var type = typeof(UnityEditor.Editor).Assembly.GetType("UnityEditor.GUIView");
+                var type = typeof(Editor).Assembly.GetType("UnityEditor.GUIView");
                 var prop = type.GetProperty("current", BindingFlags.Static | BindingFlags.Public);
                 guiView = prop.GetValue(null, null);
                 repaintMethod = guiView.GetType().GetMethod("Repaint", BindingFlags.Public | BindingFlags.Instance);

Assets/Stickers/Editor/StickerTest.cs

@@ -1,10 +1,8 @@
-using System.IO;
-using Agens;
-using UnityEngine;
-using UnityEditor;
+using UnityEditor;
 using NUnit.Framework;
+using Agens.Stickers;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     public class StickerTest
     {

Assets/Stickers/Editor/StickersBuildPostProcess.cs

@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEditor.Callbacks;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     public class StickersBuildPostprocessor
     {

Assets/Stickers/Editor/StickersExport.cs

@@ -3,10 +3,11 @@
 using System.IO;
 using System.Linq;
 using UnityEditor;
-using UnityEditor.iOS.Xcode.Stickers;
+using Agens.Stickers;
+using Agens.StickersEditor.UnityEditor.iOS.Xcode;
 using Application = UnityEngine.Application;
 
-namespace Agens.Stickers
+namespace Agens.StickersEditor
 {
     public static class StickersExport
     {

Assets/Stickers/Editor/Xcode.meta

@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 
-namespace UnityEditor.iOS.Xcode.Stickers
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
 {
 	internal class DeviceTypeRequirement
     {

Assets/Stickers/Editor/AssetCatalog.cs …ts/Stickers/Editor/Xcode/AssetCatalog.csAssets/Stickers/Editor/AssetCatalog.cs renamed to Assets/Stickers/Editor/Xcode/AssetCatalog.cs Assets/Stickers/Editor/AssetCatalog.cs renamed to Assets/Stickers/Editor/Xcode/AssetCatalog.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Linq;
 
-namespace UnityEditor.iOS.Xcode.Stickers
+namespace Agens.StickersEditor.UnityEditor.iOS.Xcode
 {
     public class JsonElement
     {