Updated Unity version to 2021.3.41f1 (simplified codebase accordingly)

Author: yasirkula

Plugins/IngameDebugConsole/Editor/DebugLogManagerEditor.cs

@@ -39,9 +39,7 @@ public class DebugLogManagerEditor : Editor
 		private SerializedProperty popupAvoidsScreenCutout;
 		private SerializedProperty autoFocusOnCommandInputField;
 
-#if UNITY_2017_3_OR_NEWER
 		private readonly GUIContent popupVisibilityLogFilterLabel = new GUIContent( "Log Filter", "Determines which log types will show the popup on screen" );
-#endif
 		private readonly GUIContent receivedLogTypesLabel = new GUIContent( "Received Log Types", "Only these logs will be received by the console window, other logs will simply be skipped" );
 		private readonly GUIContent receiveInfoLogsLabel = new GUIContent( "Info" );
 		private readonly GUIContent receiveWarningLogsLabel = new GUIContent( "Warning" );
@@ -118,21 +116,9 @@ public override void OnInspectorGUI()
 			if( popupVisibility.intValue == (int) PopupVisibility.WhenLogReceived )
 			{
 				EditorGUI.indentLevel++;
-#if UNITY_2017_3_OR_NEWER
 				Rect rect = EditorGUILayout.GetControlRect();
 				EditorGUI.BeginProperty( rect, GUIContent.none, popupVisibilityLogFilter );
 				popupVisibilityLogFilter.intValue = (int) (DebugLogFilter) EditorGUI.EnumFlagsField( rect, popupVisibilityLogFilterLabel, (DebugLogFilter) popupVisibilityLogFilter.intValue );
-#else
-				EditorGUI.BeginProperty( new Rect(), GUIContent.none, popupVisibilityLogFilter );
-				EditorGUI.BeginChangeCheck();
-
-				bool infoLog = EditorGUILayout.Toggle( "Info", ( (DebugLogFilter) popupVisibilityLogFilter.intValue & DebugLogFilter.Info ) == DebugLogFilter.Info );
-				bool warningLog = EditorGUILayout.Toggle( "Warning", ( (DebugLogFilter) popupVisibilityLogFilter.intValue & DebugLogFilter.Warning ) == DebugLogFilter.Warning );
-				bool errorLog = EditorGUILayout.Toggle( "Error", ( (DebugLogFilter) popupVisibilityLogFilter.intValue & DebugLogFilter.Error ) == DebugLogFilter.Error );
-
-				if( EditorGUI.EndChangeCheck() )
-					popupVisibilityLogFilter.intValue = ( infoLog ? (int) DebugLogFilter.Info : 0 ) | ( warningLog ? (int) DebugLogFilter.Warning : 0 ) | ( errorLog ? (int) DebugLogFilter.Error : 0 );
-#endif
 				EditorGUI.EndProperty();
 				EditorGUI.indentLevel--;
 			}

Plugins/IngameDebugConsole/Scripts/DebugLogConsole.cs

@@ -88,12 +88,10 @@ public static class DebugLogConsole
 			{ typeof( RectOffset ), ParseRectOffset },
 			{ typeof( Bounds ), ParseBounds },
 			{ typeof( GameObject ), ParseGameObject },
-#if UNITY_2017_2_OR_NEWER
 			{ typeof( Vector2Int ), ParseVector2Int },
 			{ typeof( Vector3Int ), ParseVector3Int },
 			{ typeof( RectInt ), ParseRectInt },
 			{ typeof( BoundsInt ), ParseBoundsInt },
-#endif
 		};
 
 		// All the readable names of accepted types
@@ -304,24 +302,16 @@ public static void LogSystemInfo()
 			stringBuilder.Append( "Temporary Cache Path: " ).Append( Application.temporaryCachePath ).Append( "\n" );
 			stringBuilder.Append( "Device ID: " ).Append( SystemInfo.deviceUniqueIdentifier ).Append( "\n" );
 			stringBuilder.Append( "Max Texture Size: " ).Append( SystemInfo.maxTextureSize ).Append( "\n" );
-#if UNITY_5_6_OR_NEWER
 			stringBuilder.Append( "Max Cubemap Size: " ).Append( SystemInfo.maxCubemapSize ).Append( "\n" );
-#endif
 			stringBuilder.Append( "Accelerometer: " ).Append( SystemInfo.supportsAccelerometer ? "supported\n" : "not supported\n" );
 			stringBuilder.Append( "Gyro: " ).Append( SystemInfo.supportsGyroscope ? "supported\n" : "not supported\n" );
 			stringBuilder.Append( "Location Service: " ).Append( SystemInfo.supportsLocationService ? "supported\n" : "not supported\n" );
-#if !UNITY_2019_1_OR_NEWER
-			stringBuilder.Append( "Image Effects: " ).Append( SystemInfo.supportsImageEffects ? "supported\n" : "not supported\n" );
-			stringBuilder.Append( "RenderToCubemap: " ).Append( SystemInfo.supportsRenderToCubemap ? "supported\n" : "not supported\n" );
-#endif
 			stringBuilder.Append( "Compute Shaders: " ).Append( SystemInfo.supportsComputeShaders ? "supported\n" : "not supported\n" );
 			stringBuilder.Append( "Shadows: " ).Append( SystemInfo.supportsShadows ? "supported\n" : "not supported\n" );
 			stringBuilder.Append( "Instancing: " ).Append( SystemInfo.supportsInstancing ? "supported\n" : "not supported\n" );
 			stringBuilder.Append( "Motion Vectors: " ).Append( SystemInfo.supportsMotionVectors ? "supported\n" : "not supported\n" );
 			stringBuilder.Append( "3D Textures: " ).Append( SystemInfo.supports3DTextures ? "supported\n" : "not supported\n" );
-#if UNITY_5_6_OR_NEWER
 			stringBuilder.Append( "3D Render Textures: " ).Append( SystemInfo.supports3DRenderTextures ? "supported\n" : "not supported\n" );
-#endif
 			stringBuilder.Append( "2D Array Textures: " ).Append( SystemInfo.supports2DArrayTextures ? "supported\n" : "not supported\n" );
 			stringBuilder.Append( "Cubemap Array Textures: " ).Append( SystemInfo.supportsCubemapArrayTextures ? "supported" : "not supported" );
 
@@ -1205,7 +1195,6 @@ public static bool ParseBounds( string input, out object output )
 			return ParseVector( input, typeof( Bounds ), out output );
 		}
 
-#if UNITY_2017_2_OR_NEWER
 		public static bool ParseVector2Int( string input, out object output )
 		{
 			return ParseVector( input, typeof( Vector2Int ), out output );
@@ -1225,7 +1214,6 @@ public static bool ParseBoundsInt( string input, out object output )
 		{
 			return ParseVector( input, typeof( BoundsInt ), out output );
 		}
-#endif
 
 		public static bool ParseGameObject( string input, out object output )
 		{
@@ -1472,7 +1460,6 @@ private static bool ParseVector( string input, Type vectorType, out object outpu
 
 				output = new Bounds( center, size );
 			}
-#if UNITY_2017_2_OR_NEWER
 			else if( vectorType == typeof( Vector3Int ) )
 			{
 				Vector3Int result = Vector3Int.zero;
@@ -1518,7 +1505,6 @@ private static bool ParseVector( string input, Type vectorType, out object outpu
 
 				output = new BoundsInt( center, size );
 			}
-#endif
 			else
 			{
 				output = null;

Plugins/IngameDebugConsole/Scripts/DebugLogItem.cs

@@ -12,44 +12,6 @@ namespace IngameDebugConsole
 {
 	public class DebugLogItem : MonoBehaviour, IPointerClickHandler
 	{
-		#region Platform Specific Elements
-#if !UNITY_2018_1_OR_NEWER
-#if !UNITY_EDITOR && UNITY_ANDROID && UNITY_ANDROID_JNI
-		private static AndroidJavaClass m_ajc = null;
-		private static AndroidJavaClass AJC
-		{
-			get
-			{
-				if( m_ajc == null )
-					m_ajc = new AndroidJavaClass( "com.yasirkula.unity.DebugConsole" );
-
-				return m_ajc;
-			}
-		}
-
-		private static AndroidJavaObject m_context = null;
-		private static AndroidJavaObject Context
-		{
-			get
-			{
-				if( m_context == null )
-				{
-					using( AndroidJavaObject unityClass = new AndroidJavaClass( "com.unity3d.player.UnityPlayer" ) )
-					{
-						m_context = unityClass.GetStatic<AndroidJavaObject>( "currentActivity" );
-					}
-				}
-
-				return m_context;
-			}
-		}
-#elif !UNITY_EDITOR && UNITY_IOS
-		[System.Runtime.InteropServices.DllImport( "__Internal" )]
-		private static extern void _DebugConsole_CopyText( string text );
-#endif
-#endif
-		#endregion
-
 #pragma warning disable 0649
 		// Cached components
 		[SerializeField]
@@ -228,16 +190,8 @@ public void CopyLog()
 		{
 #if UNITY_EDITOR || !UNITY_WEBGL
 			string log = GetCopyContent();
-			if( string.IsNullOrEmpty( log ) )
-				return;
-
-#if UNITY_EDITOR || UNITY_2018_1_OR_NEWER || ( !UNITY_ANDROID && !UNITY_IOS )
-			GUIUtility.systemCopyBuffer = log;
-#elif UNITY_ANDROID
-			AJC.CallStatic( "CopyText", Context, log );
-#elif UNITY_IOS
-			_DebugConsole_CopyText( log );
-#endif
+			if( !string.IsNullOrEmpty( log ) )
+				GUIUtility.systemCopyBuffer = log;
 #endif
 		}
 

Plugins/IngameDebugConsole/Scripts/DebugLogManager.cs

@@ -180,16 +180,12 @@ public class DebugLogManager : MonoBehaviour
 		private bool receiveLogcatLogsInAndroid = false;
 
 #pragma warning disable 0414
-#if UNITY_2018_3_OR_NEWER // On older Unity versions, disabling CS0169 is problematic: "Cannot restore warning 'CS0169' because it was disabled globally"
 #pragma warning disable 0169
-#endif
 		[SerializeField]
 		[HideInInspector]
 		[Tooltip( "Native logs will be filtered using these arguments. If left blank, all native logs of the application will be logged to the console. But if you want to e.g. see Admob's logs only, you can enter \"-s Ads\" (without quotes) here" )]
 		private string logcatArguments;
-#if UNITY_2018_3_OR_NEWER
 #pragma warning restore 0169
-#endif
 #pragma warning restore 0414
 
 		[SerializeField]
@@ -435,9 +431,7 @@ public bool PopupEnabled
 		// Callbacks for log window show/hide events
 		public System.Action OnLogWindowShown, OnLogWindowHidden;
 
-#if UNITY_EDITOR
 		private bool isQuittingApplication;
-#endif
 
 #if !UNITY_EDITOR && UNITY_ANDROID && UNITY_ANDROID_JNI
 		private DebugLogLogcatListener logcatListener;
@@ -564,12 +558,9 @@ private void Awake()
 				Application.logMessageReceivedThreaded += ReceivedLog;
 			}
 
-#if UNITY_EDITOR && UNITY_2018_1_OR_NEWER
 			// OnApplicationQuit isn't reliable on some Unity versions when Application.wantsToQuit is used; Application.quitting is the only reliable solution on those versions
 			// https://issuetracker.unity3d.com/issues/onapplicationquit-method-is-called-before-application-dot-wantstoquit-event-is-raised
-			Application.quitting -= OnApplicationQuitting;
 			Application.quitting += OnApplicationQuitting;
-#endif
 
 #if ENABLE_INPUT_SYSTEM && !ENABLE_LEGACY_INPUT_MANAGER
 			toggleBinding.performed += ( context ) =>
@@ -676,9 +667,7 @@ private void OnDestroy()
 			if( receiveLogsWhileInactive )
 				Application.logMessageReceivedThreaded -= ReceivedLog;
 
-#if UNITY_EDITOR && UNITY_2018_1_OR_NEWER
 			Application.quitting -= OnApplicationQuitting;
-#endif
 		}
 
 #if UNITY_EDITOR
@@ -697,16 +686,12 @@ private void OnValidate()
 				filterErrorButton.gameObject.SetActive( receiveErrorLogs || receiveExceptionLogs );
 			}
 		}
+#endif
 
-#if UNITY_2018_1_OR_NEWER
 		private void OnApplicationQuitting()
-#else
-		private void OnApplicationQuit()
-#endif
 		{
 			isQuittingApplication = true;
 		}
-#endif
 
 		// Window is resized, update the list
 		private void OnRectTransformDimensionsChange()
@@ -752,10 +737,8 @@ private void Update()
 
 		private void LateUpdate()
 		{
-#if UNITY_EDITOR
 			if( isQuittingApplication )
 				return;
-#endif
 
 			int numberOfLogsToProcess = isLogWindowVisible ? queuedLogEntries.Count : ( queuedLogEntries.Count - queuedLogLimit );
 			ProcessQueuedLogs( numberOfLogsToProcess );
@@ -1059,10 +1042,8 @@ private char OnValidateCommand( string text, int charIndex, char addedChar )
 		// A debug entry is received
 		public void ReceivedLog( string logString, string stackTrace, LogType logType )
 		{
-#if UNITY_EDITOR
 			if( isQuittingApplication )
 				return;
-#endif
 
 			switch( logType )
 			{
@@ -1828,7 +1809,7 @@ private void CheckScreenCutout()
 			if( !avoidScreenCutout )
 				return;
 
-#if UNITY_2017_2_OR_NEWER && ( UNITY_EDITOR || UNITY_ANDROID || UNITY_IOS )
+#if UNITY_EDITOR || UNITY_ANDROID || UNITY_IOS
 			// Check if there is a cutout at the top of the screen
 			int screenHeight = Screen.height;
 			float safeYMax = Screen.safeArea.yMax;

Plugins/IngameDebugConsole/Scripts/DebugLogPopup.cs

@@ -203,7 +203,7 @@ public void UpdatePosition( bool immediately )
 
 			if( debugManager.popupAvoidsScreenCutout )
 			{
-#if UNITY_2017_2_OR_NEWER && ( UNITY_EDITOR || UNITY_ANDROID || UNITY_IOS )
+#if UNITY_EDITOR || UNITY_ANDROID || UNITY_IOS
 				Rect safeArea = Screen.safeArea;
 
 				int screenWidth = Screen.width;

Plugins/IngameDebugConsole/Scripts/EventSystemHandler.cs

@@ -48,9 +48,7 @@ private void OnDisable()
 
 		private void OnSceneLoaded( Scene scene, LoadSceneMode mode )
 		{
-#if UNITY_2017_2_OR_NEWER
 			DeactivateEventSystem();
-#endif
 			ActivateEventSystemIfNeeded();
 		}