Update file(s) "Packages/unity-builder/." from "unity-korea-community/unity-builder"

KorStrix · KorStrix · commit 97af4fbb62b9 · 2021-05-31T13:56:29.000Z
diff --git a/Editor/BuildConfig/AndroidBuildConfig.cs b/Editor/BuildConfig/AndroidBuildConfig.cs
@@ -12,23 +12,29 @@ public class AndroidBuildConfig : BuildConfig
     {
         public override BuildTarget buildTarget => BuildTarget.Android;
 
-        public string keyaliasName;
-        public string keyaliasPassword;
+        [SerializeField]
+        protected string keyaliasName;
+        [SerializeField]
+        protected string keyaliasPassword;
 
         /// <summary>
         /// Keystore 파일의 경로입니다. `파일경로/파일명.keystore` 까지 쓰셔야 합니다.
         /// <para>UnityProject/Asset/ 기준의 상대 경로입니다. </para>
         /// <para>예를들어 UnityProject/Asset 폴더 밑에 example.keystore가 있으면 "/example.keystore" 입니다.</para>
         /// </summary>
-        public string keystorePath;
-        public string keystorePassword;
+        [SerializeField]
+        protected string keystorePath;
+        [SerializeField]
+        protected string keystorePassword;
 
         /// <summary>
         /// CPP 빌드를 할지 체크, CPP빌드는 오래 걸리므로 Test빌드가 아닌 Alpha 빌드부터 하는걸 권장
         /// </summary>
-        public ScriptingImplementation scriptingBackEnd;
+        [SerializeField]
+        protected ScriptingImplementation scriptingBackEnd;
 
-        public int bundleVersionCode;
+        [SerializeField]
+        protected int bundleVersionCode;
 
         public override void ResetSetting(BuildConfig config)
         {
@@ -37,9 +43,9 @@ public override void ResetSetting(BuildConfig config)
             BuildTargetGroup targetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
             scriptingBackEnd = PlayerSettings.GetScriptingBackend(targetGroup);
             bundleVersionCode = PlayerSettings.Android.bundleVersionCode;
-            config.buildPath +=
+            config.AddBuildPath(
                 "\n_{bundleVersion}.{bundleVersionCode}" +
-                "\n_{scriptingBackEnd}";
+                "\n_{scriptingBackEnd}");
         }
 
         public override void OnPreBuild(IDictionary<string, string> commandLine, ref BuildPlayerOptions buildPlayerOptions)
diff --git a/Editor/BuildConfig/BuildConfig.cs b/Editor/BuildConfig/BuildConfig.cs
@@ -15,34 +15,45 @@ public abstract class BuildConfig : BuildConfigBase
         /// <summary>
         /// 예시) com.CompanyName.ProductName  
         /// </summary>
-        public string applicationIdentifier;
+        [SerializeField]
+        protected string applicationIdentifier;
 
         /// <summary>
         /// 설치한 디바이스에 표기될 이름
         /// </summary>
-        public string productName;
+        [SerializeField]
+        protected string productName;
+        public string GetProductName() => productName;
 
-        public string defineSymbol;
+        [SerializeField]
+        protected string defineSymbol;
+        public string GetDefineSymbol() => defineSymbol;
 
         /// <summary>
         /// 빌드에 포함할 씬들, 확장자는 안쓰셔도 됩니다.
         /// <para>예시) ["Assets/SomethingScene_1", "Assets/SomethingScene_1"]</para>
         /// </summary>
-        public string[] buildSceneNames;
+        [SerializeField]
+        protected string[] buildSceneNames;
+        public string[] GetBuildSceneNames() => buildSceneNames;
 
-        public string bundleVersion;
+        [SerializeField]
+        protected string bundleVersion;
 
         // 출력할 폴더 및 파일은 Jenkins에서 처리할 예정이였으나,
         // IL2CPP의 경우 같은 장소에 빌드해놓으면 더 빠르다는 메뉴얼로 인해 일단 보류
         // https://docs.unity3d.com/kr/2020.2/Manual/IL2CPP-OptimizingBuildTimes.html
         [Tooltip("relative Path - UnityProject/Assets/")]
         [Multiline]
-        public string buildPath;
-
-        public bool developmentBuild;
-        public bool autoRunPlayer;
-        public bool openBuildFolder;
+        [SerializeField]
+        protected string buildPath;
 
+        [SerializeField]
+        protected bool developmentBuild;
+        [SerializeField]
+        protected bool autoRunPlayer;
+        [SerializeField]
+        protected bool openBuildFolder;
 
         // List<BuildConfigBase>
 
@@ -51,6 +62,13 @@ void Reset()
             ResetSetting(this);
         }
 
+        public void AddBuildPath(string addLine)
+        {
+            buildPath += addLine;
+        }
+
+
+
         public override string GetBuildPath()
         {
             DateTime now = DateTime.Now;
diff --git a/Editor/BuildConfig/WindowBuildConfig.cs b/Editor/BuildConfig/WindowBuildConfig.cs
@@ -15,17 +15,18 @@ public class WindowBuildConfig : BuildConfig
         /// <summary>
         /// CPP 빌드를 할지 체크, CPP빌드는 오래 걸리므로 Test빌드가 아닌 Alpha 빌드부터 하는걸 권장
         /// </summary>
-        public ScriptingImplementation scriptingBackEnd;
+        [SerializeField]
+        protected ScriptingImplementation scriptingBackEnd;
 
         public override void ResetSetting(BuildConfig config)
         {
             base.ResetSetting(config);
 
             BuildTargetGroup targetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
             scriptingBackEnd = PlayerSettings.GetScriptingBackend(targetGroup);
-            config.buildPath +=
+            config.AddBuildPath(
                      "\n_{bundleVersion}.{bundleVersionCode}" +
-                     "\n_{scriptingBackEnd}";
+                     "\n_{scriptingBackEnd}");
         }
 
         public override void OnPreBuild(IDictionary<string, string> commandLine, ref BuildPlayerOptions buildPlayerOptions)
diff --git a/Editor/UnityBuilder.cs b/Editor/UnityBuilder.cs
@@ -105,30 +105,30 @@ public static bool GetSO_FromCommandLine<T>(string commandLine, out T outFile)
 
         #region private
 
-        private static BuildPlayerOptions Generate_BuildPlayerOption(BuildConfig buildConfig)
+        private static BuildPlayerOptions Generate_BuildPlayerOption(BuildConfig config)
         {
-            List<string> sceneNames = new List<string>(buildConfig.buildSceneNames);
+            List<string> sceneNames = new List<string>(config.GetBuildSceneNames());
             sceneNames.ForEach(sceneName => sceneName += ".unity");
 
             BuildPlayerOptions buildPlayerOptions = new BuildPlayerOptions
             {
                 scenes = sceneNames.ToArray(),
-                locationPathName = buildConfig.GetBuildPath(),
-                target = buildConfig.buildTarget,
+                locationPathName = config.GetBuildPath(),
+                target = config.buildTarget,
                 options = BuildOptions.None
             };
 
             return buildPlayerOptions;
         }
 
 
-        private static PlayerSetting_Backup SettingBuildConfig_To_EditorSetting(BuildConfig buildConfig, BuildTargetGroup buildTargetGroup)
+        private static PlayerSetting_Backup SettingBuildConfig_To_EditorSetting(BuildConfig config, BuildTargetGroup buildTargetGroup)
         {
             string defineSymbol_Backup = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup);
-            PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, buildConfig.defineSymbol);
+            PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, config.GetDefineSymbol());
 
             string productName_Backup = PlayerSettings.productName;
-            PlayerSettings.productName = buildConfig.productName;
+            PlayerSettings.productName = config.GetProductName();
 
             return new PlayerSetting_Backup(buildTargetGroup, defineSymbol_Backup, productName_Backup);
         }
diff --git a/Tests/Editor/BuildConfigTests.cs b/Tests/Editor/BuildConfigTests.cs
@@ -15,14 +15,14 @@ public void OverwriteTest()
             AndroidBuildConfig buildConfig = AndroidBuildConfig.CreateInstance<AndroidBuildConfig>();
             buildConfig.ResetSetting(buildConfig);
 
-            string productName = buildConfig.productName;
+            string productName = buildConfig.GetProductName();
             string testProductName = "product_" + Random.Range(1, 100).ToString();
 
             string overwriteJson = $"{{\"productName\": \"{testProductName}\"}}";
             JsonUtility.FromJsonOverwrite(overwriteJson, buildConfig);
 
-            Assert.AreNotEqual(buildConfig.productName, productName);
-            Assert.AreEqual(buildConfig.productName, testProductName);
+            Assert.AreNotEqual(buildConfig.GetProductName(), productName);
+            Assert.AreEqual(buildConfig.GetProductName(), testProductName);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,14 @@ public void OverwriteTest()`
`15`	`15`	`AndroidBuildConfig buildConfig = AndroidBuildConfig.CreateInstance<AndroidBuildConfig>();`
`16`	`16`	`buildConfig.ResetSetting(buildConfig);`
`17`	`17`
`18`		`- string productName = buildConfig.productName;`
	`18`	`+ string productName = buildConfig.GetProductName();`
`19`	`19`	`string testProductName = "product_" + Random.Range(1, 100).ToString();`
`20`	`20`
`21`	`21`	`string overwriteJson = $"{{\"productName\": \"{testProductName}\"}}";`
`22`	`22`	`JsonUtility.FromJsonOverwrite(overwriteJson, buildConfig);`
`23`	`23`
`24`		`- Assert.AreNotEqual(buildConfig.productName, productName);`
`25`		`- Assert.AreEqual(buildConfig.productName, testProductName);`
	`24`	`+ Assert.AreNotEqual(buildConfig.GetProductName(), productName);`
	`25`	`+ Assert.AreEqual(buildConfig.GetProductName(), testProductName);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`