Merge pull request #4 from UniToolsTeam/develop

Develop
UniToolsTeam · Nov 16, 2021 · ea0819d · ea0819d
2 parents a8d650a + bed01e0
commit ea0819d
Show file tree

Hide file tree

Showing 16 changed files with 105 additions and 31 deletions.
diff --git a/Editor/CustomEditors/Distribute/ExportIpaEditor.cs b/Editor/CustomEditors/Distribute/ExportIpaEditor.cs
@@ -2,6 +2,7 @@
 
 namespace UniTools.Build.iOS
 {
+
     [CustomEditor(typeof(ExportIpa))]
     public sealed class ExportIpaEditor : DistributeIosApplicationStepEditor
     {

diff --git a/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs b/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs
@@ -23,4 +23,4 @@ public override void OnInspectorGUI()
             serializedObject.ApplyModifiedProperties();
         }
     }
-}
+}
diff --git a/Editor/CustomEditors/IosPostBuildStepEditor.cs b/Editor/CustomEditors/IosPostBuildStepEditor.cs
@@ -1,3 +1,4 @@
+using System;
 using UnityEditor;
 using UnityEngine;
 
@@ -18,6 +19,7 @@ protected virtual void OnEnable()
 
         public override void OnInspectorGUI()
         {
+#if UNITY_IOS
             EditorGUILayout.HelpBox("Make sure that certificate added to the Keychain", MessageType.Info);
             bool load = false;
 
@@ -49,6 +51,9 @@ public override void OnInspectorGUI()
             }
 
             serializedObject.ApplyModifiedProperties();
+#else
+            throw new Exception($"{nameof(IosPostBuildStepEditor)}: unsupported platform for {m_teamId}, {m_provisioningProfileName}, {m_provisioningProfileUuid}");
+#endif
         }
     }
-}
+}
diff --git a/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs b/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs
@@ -11,4 +11,4 @@ public override void OnInspectorGUI()
             base.OnInspectorGUI();
         }
     }
-}
+}
diff --git a/Editor/Models/ProvisioningProfile.cs b/Editor/Models/ProvisioningProfile.cs
@@ -1,6 +1,9 @@
+using System;
 using System.IO;
 using System.Text.RegularExpressions;
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
+#endif
 
 namespace UniTools.Build.iOS
 {
@@ -17,6 +20,7 @@ private ProvisioningProfile()
 
         public static ProvisioningProfile Load(string pathToFile)
         {
+#if UNITY_IOS
             const string patternPlist = "<plist(.*)<\\/plist>";
 
             ProvisioningProfile profile = new ProvisioningProfile();
@@ -32,6 +36,9 @@ public static ProvisioningProfile Load(string pathToFile)
             profile.TeamIdentifier = plistDocument.root["TeamIdentifier"].AsArray().values[0].AsString();
 
             return profile;
+#else
+            throw new Exception($"{nameof(ProvisioningProfile)}: unsupported platform.");
+#endif
         }
     }
-}
+}
diff --git a/Editor/Post/Distribute/DistributeIosApplicationStep.cs b/Editor/Post/Distribute/DistributeIosApplicationStep.cs
@@ -1,5 +1,8 @@
+using System;
 using System.IO;
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
+#endif
 using UnityEngine;
 
 namespace UniTools.Build.iOS
@@ -15,8 +18,12 @@ protected string ExportOptionsPath(string root)
             const string fileName = "ExportOptions.plist";
 
             return Path.Combine(root, fileName);
+#if !UNITY_IOS
+            throw new Exception($"{nameof(DistributeIosApplicationStep)}: unsupported platform for {m_bundleIdentifier}, {m_uploadBitcode}, {m_uploadSymbols}");
+#endif
         }
 
+#if UNITY_IOS
         protected PlistDocument CreateExportOptions()
         {
             PlistDocument plist = new PlistDocument();
@@ -35,5 +42,6 @@ protected PlistDocument CreateExportOptions()
 
             return plist;
         }
+#endif
     }
-}
+}
diff --git a/Editor/Post/Distribute/ExportIpa.cs b/Editor/Post/Distribute/ExportIpa.cs
@@ -1,8 +1,11 @@
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using UniTools.CLI;
 using UniTools.IO;
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
+#endif
 using UnityEngine;
 
 namespace UniTools.Build.iOS
@@ -20,7 +23,7 @@ public sealed class ExportIpa : DistributeIosApplicationStep
         public override async Task Execute(string pathToBuiltProject)
         {
             await Task.CompletedTask;
-
+#if UNITY_IOS
             PlistDocument exportOptions = CreateExportOptions();
             string exportOptionsPath = ExportOptionsPath(pathToBuiltProject);
 
@@ -52,6 +55,9 @@ public override async Task Execute(string pathToBuiltProject)
             {
                 throw new PostBuildStepFailedException($"{nameof(Archive)}: Failed! {result.ToString()}");
             }
+#else
+            throw new Exception($"{nameof(ExportIpa)}: unsupported platform for {m_archivePath}, {m_outputPath}, {m_method}");
+#endif
         }
     }
-}
+}
diff --git a/Editor/Post/Distribute/UploadToAppStore.cs b/Editor/Post/Distribute/UploadToAppStore.cs
@@ -1,8 +1,11 @@
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using UniTools.CLI;
 using UniTools.IO;
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
+#endif
 using UnityEngine;
 
 namespace UniTools.Build.iOS
@@ -20,6 +23,7 @@ public override async Task Execute(string pathToBuiltProject)
         {
             await Task.CompletedTask;
 
+#if UNITY_IOS
             PlistDocument exportOptions = CreateExportOptions();
             string exportOptionsPath = ExportOptionsPath(pathToBuiltProject);
 
@@ -41,6 +45,9 @@ public override async Task Execute(string pathToBuiltProject)
             {
                 throw new PostBuildStepFailedException($"{nameof(Archive)}: Failed! {result.ToString()}");
             }
+#else
+            throw new Exception($"{nameof(UploadToAppStore)}: unsupported platform for {m_archivePath}, {m_outputPath}");
+#endif
         }
     }
-}
+}
diff --git a/Editor/Post/Plist/Elements/BoolPlistElement.cs b/Editor/Post/Plist/Elements/BoolPlistElement.cs
@@ -1,14 +1,17 @@
 using System;
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
-
+#endif
 namespace UniTools.Build.iOS
 {
     [Serializable]
     public sealed class BoolPlistElement : SerializablePlistElement<bool>
     {
+#if UNITY_IOS
         public override void AddTo(PlistElementDict plistElementDict)
         {
             plistElementDict.SetBoolean(Key, Value);
         }
+#endif
     }
-}
+}
diff --git a/Editor/Post/Plist/Elements/FloatPlistElement.cs b/Editor/Post/Plist/Elements/FloatPlistElement.cs
@@ -1,14 +1,18 @@
 using System;
-using UnityEditor.iOS.Xcode;
 
+#if UNITY_IOS
+using UnityEditor.iOS.Xcode;
+#endif
 namespace UniTools.Build.iOS
 {
     [Serializable]
     public sealed class FloatPlistElement : SerializablePlistElement<float>
     {
+#if UNITY_IOS
         public override void AddTo(PlistElementDict plistElementDict)
         {
             plistElementDict.SetReal(Key, Value);
         }
+#endif
     }
 }
diff --git a/Editor/Post/Plist/Elements/IPlistElement.cs b/Editor/Post/Plist/Elements/IPlistElement.cs
@@ -1,9 +1,14 @@
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
-
+#endif
 namespace UniTools.Build.iOS
 {
     public interface IPlistElement
     {
-        void AddTo(PlistElementDict plistElementDict);
+        void AddTo(
+#if UNITY_IOS
+            PlistElementDict plistElementDict
+#endif
+        );
     }
-}
+}
diff --git a/Editor/Post/Plist/Elements/IntPlistElement.cs b/Editor/Post/Plist/Elements/IntPlistElement.cs
@@ -1,14 +1,18 @@
 using System;
-using UnityEditor.iOS.Xcode;
 
+#if UNITY_IOS
+using UnityEditor.iOS.Xcode;
+#endif
 namespace UniTools.Build.iOS
 {
     [Serializable]
     public sealed class IntPlistElement : SerializablePlistElement<int>
     {
+#if UNITY_IOS
         public override void AddTo(PlistElementDict plistElementDict)
         {
             plistElementDict.SetInteger(Key, Value);
         }
+#endif
     }
 }
diff --git a/Editor/Post/Plist/Elements/SerializablePlistElement.cs b/Editor/Post/Plist/Elements/SerializablePlistElement.cs
@@ -1,15 +1,26 @@
 using System;
-using UnityEditor.iOS.Xcode;
 using UnityEngine;
+#if UNITY_IOS
+using UnityEditor.iOS.Xcode;
+#endif
 
 namespace UniTools.Build.iOS
 {
     [Serializable]
-    public abstract class SerializablePlistElement<TValue> : IPlistElement
+    public abstract class SerializablePlistElement<TValue>
+        : IPlistElement
     {
         [SerializeField] protected string Key;
         [SerializeField] protected TValue Value;
 
+#if UNITY_IOS
         public abstract void AddTo(PlistElementDict plistElementDict);
+#else
+        public void AddTo()
+        {
+            throw new Exception($"{nameof(SerializablePlistElement<TValue>)}:Unsupported platform for {Key} and {Value}");
+        }
+
+#endif
     }
 }
diff --git a/Editor/Post/Plist/Elements/StringPlistElement.cs b/Editor/Post/Plist/Elements/StringPlistElement.cs
@@ -1,14 +1,19 @@
 using System;
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
+#endif
 
 namespace UniTools.Build.iOS
 {
     [Serializable]
     public sealed class StringPlistElement : SerializablePlistElement<string>
     {
+#if UNITY_IOS
+
         public override void AddTo(PlistElementDict plistElementDict)
         {
             plistElementDict.SetString(Key, Value);
         }
+#endif
     }
-}
+}
diff --git a/Editor/Post/Plist/ModifyInfoPlist.cs b/Editor/Post/Plist/ModifyInfoPlist.cs
@@ -1,8 +1,11 @@
-using System.Collections.Generic;
-using System.IO;
+using System;
 using System.Threading.Tasks;
-using UnityEditor.iOS.Xcode;
 using UnityEngine;
+using System.IO;
+using System.Collections.Generic;
+#if UNITY_IOS
+using UnityEditor.iOS.Xcode;
+#endif
 
 namespace UniTools.Build.iOS
 {
@@ -21,6 +24,7 @@ public override async Task Execute(string pathToBuiltProject)
         {
             await Task.CompletedTask;
 
+#if UNITY_IOS
             List<IPlistElement> elements = new List<IPlistElement>();
             if (m_bool != null)
             {
@@ -51,6 +55,9 @@ public override async Task Execute(string pathToBuiltProject)
             }
 
             File.WriteAllText(plistPath, plist.WriteToString());
+#else
+            throw new Exception($"{nameof(ModifyInfoPlist)}: unsupported platform for {m_bool}, {m_float}, {m_int}, {m_string}");
+#endif
         }
     }
 }
diff --git a/package.json b/package.json
@@ -1,22 +1,23 @@
 {
   "displayName": "UniTools.Build.iOS",
   "name": "com.unitools.build.ios",
-  "version": "0.0.0",
+  "version": "0.0.1-preview",
   "unity": "2019.1",
-  "description": "AdvancedBuildPipeline",
+  "description": "Part of the Customizable Build Pipeline tool for the iOS build target",
   "keywords": [
-    "unity",
+    "ios",
+    "build",
     "unity3d",
-    "cli",
-    "CI",
-    "CD",
-    "C#"
+    "ci-cd",
+    "build-tool",
+    "ci-cd-pipeline",
+    "unity-tool"
   ],
   "category": "Libraries",
   "type": "library",
   "dependencies": {
-    "com.unitools.cli": "0.0.0",
-    "com.unitools.io": "0.0.0",
-    "com.unitools.build": "0.0.0"
+    "com.unitools.cli": "0.0.1-preview",
+    "com.unitools.io": "0.0.1-preview",
+    "com.unitools.build": "0.0.1-preview"
   }
 }