Skip to content

Commit d78b238

Browse files
authored
CHANGE: Remove the UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS compile-time define (#2277)
1 parent 7594a3a commit d78b238

File tree

89 files changed

+85
-1938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+85
-1938
lines changed

Assets/Samples/CustomComposite/CustomComposite.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ public override void OnGUI()
145145
target.scaleFactor = EditorGUILayout.Slider(m_ScaleFactorLabel, currentValue, 0, 2);
146146
}
147147

148-
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
149148
public override void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
150149
{
151150
var slider = new Slider(m_ScaleFactorLabel.text, 0, 2)
@@ -167,8 +166,6 @@ public override void OnDrawVisualElements(VisualElement root, Action onChangedCa
167166
root.Add(slider);
168167
}
169168

170-
#endif
171-
172169
private GUIContent m_ScaleFactorLabel = new GUIContent("Scale Factor");
173170
}
174171
#endif

Assets/Samples/ProjectWideActions/ProjectWideActions.asmdef

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
"precompiledReferences": [],
1212
"autoReferenced": true,
1313
"defineConstraints": [],
14-
"versionDefines": [
15-
{
16-
"name": "Unity",
17-
"expression": "2022.3",
18-
"define": "UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS"
19-
}
20-
],
14+
"versionDefines": [],
2115
"noEngineReferences": false
2216
}

Assets/Samples/ProjectWideActions/ProjectWideActionsExample.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
2-
31
namespace UnityEngine.InputSystem.Samples.ProjectWideActions
42
{
53
public class ProjectWideActionsExample : MonoBehaviour
@@ -76,5 +74,3 @@ void Update()
7674
}
7775
} // class ProjectWideActionsExample
7876
} // namespace UnityEngine.InputSystem.Samples.ProjectWideActions
79-
80-
#endif

Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
21
using NUnit.Framework;
32
using UnityEngine.InputSystem;
43
using UnityEngine.InputSystem.Editor;
@@ -405,4 +404,3 @@ public void ChangeBindingsControlSchemesCommand_CanRemoveControlSchemes()
405404
Assert.That(groupsProperty.stringValue, Is.EqualTo(string.Empty));
406405
}
407406
}
408-
#endif

Assets/Tests/InputSystem.Editor/CustomProcessorEnumTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
1+
#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER
22

33
using System;
44
using NUnit.Framework;

Assets/Tests/InputSystem.Editor/InputActionReferencePropertyDrawerEditorTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS // Mimic implementation guard
2-
31
using System;
42
using System.Collections;
53
using NUnit.Framework;
@@ -168,5 +166,3 @@ public IEnumerator FieldObjectIsNullWhenReferenceIsInvalid()
168166
Assert.That(fieldObj, Is.Null);
169167
}
170168
}
171-
172-
#endif // UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// UITK TreeView is not supported in earlier versions
2-
// Therefore the UITK version of the InputActionAsset Editor is not available on earlier Editor versions either.
3-
#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
1+
#if UNITY_EDITOR && UNITY_6000_0_OR_NEWER
42

53
using NUnit.Framework;
64
using System;

Assets/Tests/InputSystem.Editor/ProjectWideInputActionsEditorTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
2-
31
using System;
42
using System.Collections.Generic;
53
using System.IO;
@@ -496,5 +494,3 @@ public void ProjectWideActions_CanBeAssignedAndFiresCallbackWhenAssignedAndDiffe
496494
Assert.That(m_CallbackCount, Is.EqualTo(2));
497495
}
498496
}
499-
500-
#endif

Assets/Tests/InputSystem.Editor/SelectorsTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// UITK TreeView is not supported in earlier versions
2-
// Therefore the UITK version of the InputActionAsset Editor is not available on earlier Editor versions either.
3-
#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
1+
#if UNITY_EDITOR
42
using System;
53
using System.Collections.Generic;
64
using System.Linq;

Assets/Tests/InputSystem.Editor/TestData.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
21
using System.Collections.Generic;
32
using UnityEditor;
43
using UnityEngine;
@@ -71,4 +70,3 @@ public static Generator<IEnumerable<T>> N<T>(Generator<T> generator, int count)
7170
});
7271
}
7372
}
74-
#endif

0 commit comments

Comments
 (0)