Merge pull request #98 from arimger/develop

Develop - 0.12.8
arimger · Dec 29, 2023 · 2c3710a · 2c3710a
2 parents 3d4e8ab + f6188a7
commit 2c3710a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs b/Assets/Editor Toolbox/Editor/ToolboxDrawerModule.cs
@@ -261,7 +261,11 @@ internal static void UpdateDrawers(IToolboxInspectorSettings settings)
         /// </summary>
         internal static bool HasNativeTypeDrawer(Type type)
         {
+#if UNITY_2023_3_OR_NEWER
+            var parameters = new object[] { type, null, false };
+#else
             var parameters = new object[] { type };
+#endif
             var result = getDrawerTypeForTypeMethod.Invoke(null, parameters) as Type;
             return result != null && typeof(PropertyDrawer).IsAssignableFrom(result);
         }

diff --git a/Assets/Editor Toolbox/Editor/Utilities/ScriptingUtility.cs b/Assets/Editor Toolbox/Editor/Utilities/ScriptingUtility.cs
@@ -2,21 +2,32 @@
 using System.Linq;
 
 using UnityEditor;
+using UnityEditor.Build;
 
 namespace Toolbox.Editor
 {
     public static class ScriptingUtility
     {
         public static List<string> GetDefines()
         {
+#if UNITY_2023_1_OR_NEWER
+            var target = NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
+            var defines = PlayerSettings.GetScriptingDefineSymbols(target);
+#else
             var defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
+#endif
             return defines.Split(';').ToList();
         }
 
         public static void SetDefines(List<string> definesList)
         {
             var defines = string.Join(";", definesList.ToArray());
+#if UNITY_2023_1_OR_NEWER
+            var target = NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup);
+            PlayerSettings.SetScriptingDefineSymbols(target, defines);
+#else
             PlayerSettings.SetScriptingDefineSymbolsForGroup(EditorUserBuildSettings.selectedBuildTargetGroup, defines);
+#endif
         }
 
         public static void AppendDefine(string define)