Skip to content

Commit b880a2f

Browse files
committed
The Utils alias has been hidden to avoid conflict with the global namespace.
1 parent a0f73b4 commit b880a2f

7 files changed

+15
-9
lines changed

Editor/CASInitSettignsInspector.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
using UnityEditor.AnimatedValues;
99
using UnityEditorInternal;
1010
using UnityEngine;
11-
using Utils = CAS.UEditor.CASEditorUtils;
1211

1312
namespace CAS.UEditor
1413
{
14+
using Utils = CASEditorUtils;
15+
1516
[CustomEditor(typeof(CASInitSettings))]
1617
internal class CASInitSettignsInspector : Editor
1718
{

Editor/CASInternal.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
using UnityEditor;
88
using UnityEditor.AnimatedValues;
99
using UnityEngine;
10-
using Utils = CAS.UEditor.CASEditorUtils;
1110

1211
namespace CAS.UEditor
1312
{
13+
using Utils = CASEditorUtils;
14+
1415
public partial class DependencyManager
1516
{
1617
#region Internal implementation

Editor/CASPostGenerateGradle.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
using UnityEngine;
1212
using UnityEditor.Android;
1313
using UnityEditor;
14-
using Utils = CAS.UEditor.CASEditorUtils;
1514

1615
namespace CAS.UEditor
1716
{
17+
using Utils = CASEditorUtils;
18+
1819
public class CASPostGenerateGradle : IPostGenerateGradleAndroidProject
1920
{
2021
private const string applyFromPlugin = "apply from: 'CASPlugin.androidlib/";

Editor/CASPreprocessBuild.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
using UnityEditor.Build;
1010
using UnityEngine;
1111
using UnityEngine.Networking;
12-
using Utils = CAS.UEditor.CASEditorUtils;
1312

1413
#if UNITY_2018_1_OR_NEWER
1514
using UnityEditor.Build.Reporting;
1615
#endif
1716

1817
namespace CAS.UEditor
1918
{
19+
using Utils = CASEditorUtils;
20+
2021
#if UNITY_2018_1_OR_NEWER
2122
public class CASPreprocessBuild : IPreprocessBuildWithReport
2223
#else

Editor/CASPreprocessGradle.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@
3232
using System.Reflection;
3333
using UnityEditor;
3434
using UnityEngine;
35-
using Utils = CAS.UEditor.CASEditorUtils;
3635

3736
namespace CAS.UEditor
3837
{
38+
using Utils = CASEditorUtils;
39+
3940
internal static class CASPreprocessGradle
4041
{
4142
internal static void Configure(CASEditorSettings settings)
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "CleverAdsSolutions-Editor",
3+
"rootNamespace": "",
34
"references": [
45
"CleverAdsSolutions"
56
],
6-
"optionalUnityReferences": [],
77
"includePlatforms": [
88
"Editor"
99
],
@@ -12,5 +12,7 @@
1212
"overrideReferences": false,
1313
"precompiledReferences": [],
1414
"autoReferenced": true,
15-
"defineConstraints": []
15+
"defineConstraints": [],
16+
"versionDefines": [],
17+
"noEngineReferences": false
1618
}

Editor/DependencyManager.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.IO;
66
using UnityEditor;
77
using UnityEngine;
8-
using Utils = CAS.UEditor.CASEditorUtils;
98

109
namespace CAS.UEditor
1110
{
@@ -24,7 +23,7 @@ public Dependency[] networks
2423

2524
public static DependencyManager Create(BuildTarget platform, Audience audience, bool deepInit)
2625
{
27-
string listPath = Utils.GetTemplatePath("CAS" + platform.ToString() + "Mediation.list");
26+
string listPath = CASEditorUtils.GetTemplatePath("CAS" + platform.ToString() + "Mediation.list");
2827
if (listPath == null)
2928
return null;
3029

0 commit comments

Comments
 (0)