From 5c9c7d515b426668014a7c2aef73a81aeb895a29 Mon Sep 17 00:00:00 2001 From: Stanislav Felinskyi Date: Mon, 21 Jun 2021 12:52:49 +0300 Subject: [PATCH 1/7] Misc: package info --- package.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9658812..2c20bfa 100644 --- a/package.json +++ b/package.json @@ -3,14 +3,15 @@ "name": "com.unitools.build.ios", "version": "0.0.0", "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", From 104fe7ad608f296ca9a75086a289bb977294eabc Mon Sep 17 00:00:00 2001 From: diana_shnaider Date: Wed, 23 Jun 2021 11:53:45 +0300 Subject: [PATCH 2/7] Misc: Set compilation defines --- Editor/CustomEditors/Archive/ArchiveEditor.cs | 4 +++- .../Distribute/DistributeIosApplicationStepEditor.cs | 4 +++- Editor/CustomEditors/Distribute/ExportIpaEditor.cs | 6 ++++-- Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs | 4 +++- Editor/CustomEditors/IosPostBuildStepEditor.cs | 4 +++- Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs | 5 +++-- Editor/Models/ProvisioningProfile.cs | 4 +++- Editor/Post/Distribute/DistributeIosApplicationStep.cs | 4 +++- Editor/Post/Distribute/ExportIpa.cs | 4 +++- Editor/Post/Distribute/UploadToAppStore.cs | 4 +++- Editor/Post/Plist/Elements/BoolPlistElement.cs | 4 +++- Editor/Post/Plist/Elements/FloatPlistElement.cs | 4 +++- Editor/Post/Plist/Elements/IPlistElement.cs | 4 +++- Editor/Post/Plist/Elements/IntPlistElement.cs | 4 +++- Editor/Post/Plist/Elements/SerializablePlistElement.cs | 4 +++- Editor/Post/Plist/Elements/StringPlistElement.cs | 4 +++- Editor/Post/Plist/ModifyInfoPlist.cs | 4 +++- 17 files changed, 52 insertions(+), 19 deletions(-) diff --git a/Editor/CustomEditors/Archive/ArchiveEditor.cs b/Editor/CustomEditors/Archive/ArchiveEditor.cs index 1e1c957..c9aaf59 100644 --- a/Editor/CustomEditors/Archive/ArchiveEditor.cs +++ b/Editor/CustomEditors/Archive/ArchiveEditor.cs @@ -1,5 +1,6 @@ using UnityEditor; +#if UNITY_IOS namespace UniTools.Build.iOS { [CustomEditor(typeof(Archive))] @@ -33,4 +34,5 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/CustomEditors/Distribute/DistributeIosApplicationStepEditor.cs b/Editor/CustomEditors/Distribute/DistributeIosApplicationStepEditor.cs index 43e907b..3b29100 100644 --- a/Editor/CustomEditors/Distribute/DistributeIosApplicationStepEditor.cs +++ b/Editor/CustomEditors/Distribute/DistributeIosApplicationStepEditor.cs @@ -1,6 +1,7 @@ using UnityEditor; using UnityEngine; +#if UNITY_IOS namespace UniTools.Build.iOS { public abstract class DistributeIosApplicationStepEditor : IosPostBuildStepEditor @@ -35,4 +36,5 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/CustomEditors/Distribute/ExportIpaEditor.cs b/Editor/CustomEditors/Distribute/ExportIpaEditor.cs index 7df77a7..e523689 100644 --- a/Editor/CustomEditors/Distribute/ExportIpaEditor.cs +++ b/Editor/CustomEditors/Distribute/ExportIpaEditor.cs @@ -1,7 +1,8 @@ using UnityEditor; - +#if UNITY_IOS namespace UniTools.Build.iOS { + [CustomEditor(typeof(ExportIpa))] public sealed class ExportIpaEditor : DistributeIosApplicationStepEditor { @@ -26,4 +27,5 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs b/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs index 743cc5e..b7b9514 100644 --- a/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs +++ b/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs @@ -1,4 +1,5 @@ using UnityEditor; +#if UNITY_IOS namespace UniTools.Build.iOS { @@ -23,4 +24,5 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/CustomEditors/IosPostBuildStepEditor.cs b/Editor/CustomEditors/IosPostBuildStepEditor.cs index a216e23..13df0b1 100644 --- a/Editor/CustomEditors/IosPostBuildStepEditor.cs +++ b/Editor/CustomEditors/IosPostBuildStepEditor.cs @@ -1,6 +1,7 @@ using UnityEditor; using UnityEngine; +#if UNITY_IOS namespace UniTools.Build.iOS { public abstract class IosPostBuildStepEditor : Editor @@ -51,4 +52,5 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs b/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs index ad2c84b..f541387 100644 --- a/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs +++ b/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs @@ -1,5 +1,5 @@ using UnityEditor; - +#if UNITY_IOS namespace UniTools.Build.iOS { [CustomEditor(typeof(ModifyInfoPlist))] @@ -11,4 +11,5 @@ public override void OnInspectorGUI() base.OnInspectorGUI(); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Models/ProvisioningProfile.cs b/Editor/Models/ProvisioningProfile.cs index c364479..127f666 100644 --- a/Editor/Models/ProvisioningProfile.cs +++ b/Editor/Models/ProvisioningProfile.cs @@ -1,5 +1,6 @@ using System.IO; using System.Text.RegularExpressions; +#if UNITY_IOS using UnityEditor.iOS.Xcode; namespace UniTools.Build.iOS @@ -34,4 +35,5 @@ public static ProvisioningProfile Load(string pathToFile) return profile; } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Distribute/DistributeIosApplicationStep.cs b/Editor/Post/Distribute/DistributeIosApplicationStep.cs index c380c9e..f6ee8ae 100644 --- a/Editor/Post/Distribute/DistributeIosApplicationStep.cs +++ b/Editor/Post/Distribute/DistributeIosApplicationStep.cs @@ -1,4 +1,5 @@ using System.IO; +#if UNITY_IOS using UnityEditor.iOS.Xcode; using UnityEngine; @@ -36,4 +37,5 @@ protected PlistDocument CreateExportOptions() return plist; } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Distribute/ExportIpa.cs b/Editor/Post/Distribute/ExportIpa.cs index ad502a6..2c5b1ce 100644 --- a/Editor/Post/Distribute/ExportIpa.cs +++ b/Editor/Post/Distribute/ExportIpa.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using UniTools.CLI; using UniTools.IO; +#if UNITY_IOS using UnityEditor.iOS.Xcode; using UnityEngine; @@ -54,4 +55,5 @@ public override async Task Execute(string pathToBuiltProject) } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Distribute/UploadToAppStore.cs b/Editor/Post/Distribute/UploadToAppStore.cs index b98b10a..d688c08 100644 --- a/Editor/Post/Distribute/UploadToAppStore.cs +++ b/Editor/Post/Distribute/UploadToAppStore.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using UniTools.CLI; using UniTools.IO; +#if UNITY_IOS using UnityEditor.iOS.Xcode; using UnityEngine; @@ -43,4 +44,5 @@ public override async Task Execute(string pathToBuiltProject) } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/BoolPlistElement.cs b/Editor/Post/Plist/Elements/BoolPlistElement.cs index 5c6ce11..bc71ed6 100644 --- a/Editor/Post/Plist/Elements/BoolPlistElement.cs +++ b/Editor/Post/Plist/Elements/BoolPlistElement.cs @@ -1,4 +1,5 @@ using System; +#if UNITY_IOS using UnityEditor.iOS.Xcode; namespace UniTools.Build.iOS @@ -11,4 +12,5 @@ public override void AddTo(PlistElementDict plistElementDict) plistElementDict.SetBoolean(Key, Value); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/FloatPlistElement.cs b/Editor/Post/Plist/Elements/FloatPlistElement.cs index 799d9f0..7a3552f 100644 --- a/Editor/Post/Plist/Elements/FloatPlistElement.cs +++ b/Editor/Post/Plist/Elements/FloatPlistElement.cs @@ -1,4 +1,5 @@ using System; +#if UNITY_IOS using UnityEditor.iOS.Xcode; namespace UniTools.Build.iOS @@ -11,4 +12,5 @@ public override void AddTo(PlistElementDict plistElementDict) plistElementDict.SetReal(Key, Value); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/IPlistElement.cs b/Editor/Post/Plist/Elements/IPlistElement.cs index 5279c62..592bd8a 100644 --- a/Editor/Post/Plist/Elements/IPlistElement.cs +++ b/Editor/Post/Plist/Elements/IPlistElement.cs @@ -1,3 +1,4 @@ +#if UNITY_IOS using UnityEditor.iOS.Xcode; namespace UniTools.Build.iOS @@ -6,4 +7,5 @@ public interface IPlistElement { void AddTo(PlistElementDict plistElementDict); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/IntPlistElement.cs b/Editor/Post/Plist/Elements/IntPlistElement.cs index f0442a0..8a9bc0b 100644 --- a/Editor/Post/Plist/Elements/IntPlistElement.cs +++ b/Editor/Post/Plist/Elements/IntPlistElement.cs @@ -1,4 +1,5 @@ using System; +#if UNITY_IOS using UnityEditor.iOS.Xcode; namespace UniTools.Build.iOS @@ -11,4 +12,5 @@ public override void AddTo(PlistElementDict plistElementDict) plistElementDict.SetInteger(Key, Value); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/SerializablePlistElement.cs b/Editor/Post/Plist/Elements/SerializablePlistElement.cs index aad68a1..1b8a4c1 100644 --- a/Editor/Post/Plist/Elements/SerializablePlistElement.cs +++ b/Editor/Post/Plist/Elements/SerializablePlistElement.cs @@ -1,4 +1,5 @@ using System; +#if UNITY_IOS using UnityEditor.iOS.Xcode; using UnityEngine; @@ -12,4 +13,5 @@ public abstract class SerializablePlistElement : IPlistElement public abstract void AddTo(PlistElementDict plistElementDict); } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/StringPlistElement.cs b/Editor/Post/Plist/Elements/StringPlistElement.cs index 57543ad..c285c29 100644 --- a/Editor/Post/Plist/Elements/StringPlistElement.cs +++ b/Editor/Post/Plist/Elements/StringPlistElement.cs @@ -1,4 +1,5 @@ using System; +#if UNITY_IOS using UnityEditor.iOS.Xcode; namespace UniTools.Build.iOS @@ -11,4 +12,5 @@ public override void AddTo(PlistElementDict plistElementDict) plistElementDict.SetString(Key, Value); } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Editor/Post/Plist/ModifyInfoPlist.cs b/Editor/Post/Plist/ModifyInfoPlist.cs index 2c7a5b7..f1de466 100644 --- a/Editor/Post/Plist/ModifyInfoPlist.cs +++ b/Editor/Post/Plist/ModifyInfoPlist.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; +#if UNITY_IOS using UnityEditor.iOS.Xcode; using UnityEngine; @@ -53,4 +54,5 @@ public override async Task Execute(string pathToBuiltProject) File.WriteAllText(plistPath, plist.WriteToString()); } } -} \ No newline at end of file +} +#endif \ No newline at end of file From 717c520787adaa6d5e28aee8f88d6614a9a67e63 Mon Sep 17 00:00:00 2001 From: Stanislav Felinskyi Date: Wed, 23 Jun 2021 12:09:59 +0300 Subject: [PATCH 3/7] Misc: Info plist for ios --- Editor/Post/Plist/Elements/BoolPlistElement.cs | 5 +++-- Editor/Post/Plist/Elements/FloatPlistElement.cs | 8 +++++--- Editor/Post/Plist/Elements/IPlistElement.cs | 9 ++++++--- Editor/Post/Plist/Elements/IntPlistElement.cs | 8 +++++--- .../Plist/Elements/SerializablePlistElement.cs | 17 +++++++++++++---- .../Post/Plist/Elements/StringPlistElement.cs | 5 ++++- Editor/Post/Plist/ModifyInfoPlist.cs | 13 ++++++++----- 7 files changed, 44 insertions(+), 21 deletions(-) diff --git a/Editor/Post/Plist/Elements/BoolPlistElement.cs b/Editor/Post/Plist/Elements/BoolPlistElement.cs index bc71ed6..69a89eb 100644 --- a/Editor/Post/Plist/Elements/BoolPlistElement.cs +++ b/Editor/Post/Plist/Elements/BoolPlistElement.cs @@ -1,16 +1,17 @@ using System; #if UNITY_IOS using UnityEditor.iOS.Xcode; - +#endif namespace UniTools.Build.iOS { [Serializable] public sealed class BoolPlistElement : SerializablePlistElement { +#if UNITY_IOS public override void AddTo(PlistElementDict plistElementDict) { plistElementDict.SetBoolean(Key, Value); } +#endif } } -#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/FloatPlistElement.cs b/Editor/Post/Plist/Elements/FloatPlistElement.cs index 7a3552f..f8e8750 100644 --- a/Editor/Post/Plist/Elements/FloatPlistElement.cs +++ b/Editor/Post/Plist/Elements/FloatPlistElement.cs @@ -1,16 +1,18 @@ using System; + #if UNITY_IOS using UnityEditor.iOS.Xcode; - +#endif namespace UniTools.Build.iOS { [Serializable] public sealed class FloatPlistElement : SerializablePlistElement { +#if UNITY_IOS public override void AddTo(PlistElementDict plistElementDict) { plistElementDict.SetReal(Key, Value); } +#endif } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/IPlistElement.cs b/Editor/Post/Plist/Elements/IPlistElement.cs index 592bd8a..fb34cce 100644 --- a/Editor/Post/Plist/Elements/IPlistElement.cs +++ b/Editor/Post/Plist/Elements/IPlistElement.cs @@ -1,11 +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 + ); } } -#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/IntPlistElement.cs b/Editor/Post/Plist/Elements/IntPlistElement.cs index 8a9bc0b..ca50671 100644 --- a/Editor/Post/Plist/Elements/IntPlistElement.cs +++ b/Editor/Post/Plist/Elements/IntPlistElement.cs @@ -1,16 +1,18 @@ using System; + #if UNITY_IOS using UnityEditor.iOS.Xcode; - +#endif namespace UniTools.Build.iOS { [Serializable] public sealed class IntPlistElement : SerializablePlistElement { +#if UNITY_IOS public override void AddTo(PlistElementDict plistElementDict) { plistElementDict.SetInteger(Key, Value); } +#endif } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/SerializablePlistElement.cs b/Editor/Post/Plist/Elements/SerializablePlistElement.cs index 1b8a4c1..8e25f40 100644 --- a/Editor/Post/Plist/Elements/SerializablePlistElement.cs +++ b/Editor/Post/Plist/Elements/SerializablePlistElement.cs @@ -1,17 +1,26 @@ using System; +using UnityEngine; #if UNITY_IOS using UnityEditor.iOS.Xcode; -using UnityEngine; +#endif namespace UniTools.Build.iOS { [Serializable] - public abstract class SerializablePlistElement : IPlistElement + public abstract class SerializablePlistElement + : 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)}:Unsupported platform for {Key} and {Value}"); + } + +#endif } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/StringPlistElement.cs b/Editor/Post/Plist/Elements/StringPlistElement.cs index c285c29..875b763 100644 --- a/Editor/Post/Plist/Elements/StringPlistElement.cs +++ b/Editor/Post/Plist/Elements/StringPlistElement.cs @@ -1,16 +1,19 @@ using System; #if UNITY_IOS using UnityEditor.iOS.Xcode; +#endif namespace UniTools.Build.iOS { [Serializable] public sealed class StringPlistElement : SerializablePlistElement { +#if UNITY_IOS + public override void AddTo(PlistElementDict plistElementDict) { plistElementDict.SetString(Key, Value); } +#endif } } -#endif \ No newline at end of file diff --git a/Editor/Post/Plist/ModifyInfoPlist.cs b/Editor/Post/Plist/ModifyInfoPlist.cs index f1de466..cd91246 100644 --- a/Editor/Post/Plist/ModifyInfoPlist.cs +++ b/Editor/Post/Plist/ModifyInfoPlist.cs @@ -1,9 +1,9 @@ -using System.Collections.Generic; -using System.IO; +using System; using System.Threading.Tasks; +using UnityEngine; #if UNITY_IOS using UnityEditor.iOS.Xcode; -using UnityEngine; +#endif namespace UniTools.Build.iOS { @@ -22,6 +22,7 @@ public override async Task Execute(string pathToBuiltProject) { await Task.CompletedTask; +#if UNITY_IOS List elements = new List(); if (m_bool != null) { @@ -52,7 +53,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 } } -} -#endif \ No newline at end of file +} \ No newline at end of file From a43dc9b1f3c9fddbef8f360e8e55c36c9e03b033 Mon Sep 17 00:00:00 2001 From: diana_shnaider Date: Wed, 23 Jun 2021 13:17:50 +0300 Subject: [PATCH 4/7] Misc: Added changes --- Editor/Post/Plist/Elements/SerializablePlistElement.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Editor/Post/Plist/Elements/SerializablePlistElement.cs b/Editor/Post/Plist/Elements/SerializablePlistElement.cs index 8e25f40..78c1d4e 100644 --- a/Editor/Post/Plist/Elements/SerializablePlistElement.cs +++ b/Editor/Post/Plist/Elements/SerializablePlistElement.cs @@ -7,10 +7,11 @@ namespace UniTools.Build.iOS { [Serializable] + public abstract class SerializablePlistElement : IPlistElement { - [SerializeField] protected string Key; + [SerializeField] protected string Key; [SerializeField] protected TValue Value; #if UNITY_IOS From e720be17a9709a1073ff83e5a8d1e84a09c0bfc8 Mon Sep 17 00:00:00 2001 From: diana_shnaider Date: Wed, 23 Jun 2021 15:36:11 +0300 Subject: [PATCH 5/7] Misc: Added platform dependent compilation defines --- Editor/CustomEditors/Archive/ArchiveEditor.cs | 4 +--- .../Distribute/DistributeIosApplicationStepEditor.cs | 4 +--- Editor/CustomEditors/Distribute/ExportIpaEditor.cs | 5 ++--- Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs | 2 -- Editor/CustomEditors/IosPostBuildStepEditor.cs | 7 +++++-- Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs | 3 +-- Editor/Models/ProvisioningProfile.cs | 7 ++++++- Editor/Post/Distribute/DistributeIosApplicationStep.cs | 8 +++++++- Editor/Post/Distribute/ExportIpa.cs | 8 ++++++-- Editor/Post/Distribute/UploadToAppStore.cs | 7 ++++++- Editor/Post/Plist/Elements/SerializablePlistElement.cs | 3 +-- Editor/Post/Plist/ModifyInfoPlist.cs | 2 ++ 12 files changed, 38 insertions(+), 22 deletions(-) diff --git a/Editor/CustomEditors/Archive/ArchiveEditor.cs b/Editor/CustomEditors/Archive/ArchiveEditor.cs index c9aaf59..1e1c957 100644 --- a/Editor/CustomEditors/Archive/ArchiveEditor.cs +++ b/Editor/CustomEditors/Archive/ArchiveEditor.cs @@ -1,6 +1,5 @@ using UnityEditor; -#if UNITY_IOS namespace UniTools.Build.iOS { [CustomEditor(typeof(Archive))] @@ -34,5 +33,4 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Editor/CustomEditors/Distribute/DistributeIosApplicationStepEditor.cs b/Editor/CustomEditors/Distribute/DistributeIosApplicationStepEditor.cs index 3b29100..43e907b 100644 --- a/Editor/CustomEditors/Distribute/DistributeIosApplicationStepEditor.cs +++ b/Editor/CustomEditors/Distribute/DistributeIosApplicationStepEditor.cs @@ -1,7 +1,6 @@ using UnityEditor; using UnityEngine; -#if UNITY_IOS namespace UniTools.Build.iOS { public abstract class DistributeIosApplicationStepEditor : IosPostBuildStepEditor @@ -36,5 +35,4 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Editor/CustomEditors/Distribute/ExportIpaEditor.cs b/Editor/CustomEditors/Distribute/ExportIpaEditor.cs index e523689..550dab1 100644 --- a/Editor/CustomEditors/Distribute/ExportIpaEditor.cs +++ b/Editor/CustomEditors/Distribute/ExportIpaEditor.cs @@ -1,5 +1,5 @@ using UnityEditor; -#if UNITY_IOS + namespace UniTools.Build.iOS { @@ -27,5 +27,4 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs b/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs index b7b9514..d031740 100644 --- a/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs +++ b/Editor/CustomEditors/Distribute/UploadToAppStoreEditor.cs @@ -1,5 +1,4 @@ using UnityEditor; -#if UNITY_IOS namespace UniTools.Build.iOS { @@ -25,4 +24,3 @@ public override void OnInspectorGUI() } } } -#endif \ No newline at end of file diff --git a/Editor/CustomEditors/IosPostBuildStepEditor.cs b/Editor/CustomEditors/IosPostBuildStepEditor.cs index 13df0b1..90c8ae6 100644 --- a/Editor/CustomEditors/IosPostBuildStepEditor.cs +++ b/Editor/CustomEditors/IosPostBuildStepEditor.cs @@ -1,7 +1,7 @@ +using System; using UnityEditor; using UnityEngine; -#if UNITY_IOS namespace UniTools.Build.iOS { public abstract class IosPostBuildStepEditor : Editor @@ -19,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; @@ -50,7 +51,9 @@ public override void OnInspectorGUI() } serializedObject.ApplyModifiedProperties(); +#else + throw new Exception($"{nameof(IosPostBuildStepEditor)}: unsupported platform for {m_teamId}, {m_provisioningProfileName}, {m_provisioningProfileUuid}"); +#endif } } } -#endif \ No newline at end of file diff --git a/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs b/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs index f541387..6d38fd1 100644 --- a/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs +++ b/Editor/CustomEditors/Plist/ModifyInfoPlistEditor.cs @@ -1,5 +1,5 @@ using UnityEditor; -#if UNITY_IOS + namespace UniTools.Build.iOS { [CustomEditor(typeof(ModifyInfoPlist))] @@ -12,4 +12,3 @@ public override void OnInspectorGUI() } } } -#endif \ No newline at end of file diff --git a/Editor/Models/ProvisioningProfile.cs b/Editor/Models/ProvisioningProfile.cs index 127f666..74430db 100644 --- a/Editor/Models/ProvisioningProfile.cs +++ b/Editor/Models/ProvisioningProfile.cs @@ -1,7 +1,9 @@ +using System; using System.IO; using System.Text.RegularExpressions; #if UNITY_IOS using UnityEditor.iOS.Xcode; +#endif namespace UniTools.Build.iOS { @@ -18,6 +20,7 @@ private ProvisioningProfile() public static ProvisioningProfile Load(string pathToFile) { +#if UNITY_IOS const string patternPlist = ""; ProvisioningProfile profile = new ProvisioningProfile(); @@ -33,7 +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 } } } -#endif \ No newline at end of file diff --git a/Editor/Post/Distribute/DistributeIosApplicationStep.cs b/Editor/Post/Distribute/DistributeIosApplicationStep.cs index f6ee8ae..9e2a328 100644 --- a/Editor/Post/Distribute/DistributeIosApplicationStep.cs +++ b/Editor/Post/Distribute/DistributeIosApplicationStep.cs @@ -1,6 +1,8 @@ +using System; using System.IO; #if UNITY_IOS using UnityEditor.iOS.Xcode; +#endif using UnityEngine; namespace UniTools.Build.iOS @@ -16,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(); @@ -36,6 +42,6 @@ protected PlistDocument CreateExportOptions() return plist; } +#endif } } -#endif \ No newline at end of file diff --git a/Editor/Post/Distribute/ExportIpa.cs b/Editor/Post/Distribute/ExportIpa.cs index 2c5b1ce..1d18a99 100644 --- a/Editor/Post/Distribute/ExportIpa.cs +++ b/Editor/Post/Distribute/ExportIpa.cs @@ -1,9 +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 @@ -21,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); @@ -53,7 +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 } } } -#endif \ No newline at end of file diff --git a/Editor/Post/Distribute/UploadToAppStore.cs b/Editor/Post/Distribute/UploadToAppStore.cs index d688c08..c953c73 100644 --- a/Editor/Post/Distribute/UploadToAppStore.cs +++ b/Editor/Post/Distribute/UploadToAppStore.cs @@ -1,9 +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 @@ -21,6 +23,7 @@ public override async Task Execute(string pathToBuiltProject) { await Task.CompletedTask; +#if UNITY_IOS PlistDocument exportOptions = CreateExportOptions(); string exportOptionsPath = ExportOptionsPath(pathToBuiltProject); @@ -42,7 +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 } } } -#endif \ No newline at end of file diff --git a/Editor/Post/Plist/Elements/SerializablePlistElement.cs b/Editor/Post/Plist/Elements/SerializablePlistElement.cs index 78c1d4e..8e25f40 100644 --- a/Editor/Post/Plist/Elements/SerializablePlistElement.cs +++ b/Editor/Post/Plist/Elements/SerializablePlistElement.cs @@ -7,11 +7,10 @@ namespace UniTools.Build.iOS { [Serializable] - public abstract class SerializablePlistElement : IPlistElement { - [SerializeField] protected string Key; + [SerializeField] protected string Key; [SerializeField] protected TValue Value; #if UNITY_IOS diff --git a/Editor/Post/Plist/ModifyInfoPlist.cs b/Editor/Post/Plist/ModifyInfoPlist.cs index cd91246..72e8204 100644 --- a/Editor/Post/Plist/ModifyInfoPlist.cs +++ b/Editor/Post/Plist/ModifyInfoPlist.cs @@ -1,6 +1,8 @@ using System; using System.Threading.Tasks; using UnityEngine; +using System.IO; +using System.Collections.Generic; #if UNITY_IOS using UnityEditor.iOS.Xcode; #endif From 120aca8f5a8fa434d688e22bed31cadc450408cf Mon Sep 17 00:00:00 2001 From: diana_shnaider Date: Mon, 5 Jul 2021 09:14:37 +0300 Subject: [PATCH 6/7] Updated package dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2c20bfa..25fc1fd 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "category": "Libraries", "type": "library", "dependencies": { - "com.unitools.cli": "0.0.0", + "com.unitools.cli": "0.0.1-preview", "com.unitools.io": "0.0.0", "com.unitools.build": "0.0.0" } From bed01e029271259aa4468ac6d9a517308d3eba6e Mon Sep 17 00:00:00 2001 From: Diana Shnaider Date: Thu, 8 Jul 2021 12:37:57 +0300 Subject: [PATCH 7/7] Updated package info --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 25fc1fd..62ce21a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "displayName": "UniTools.Build.iOS", "name": "com.unitools.build.ios", - "version": "0.0.0", + "version": "0.0.1-preview", "unity": "2019.1", "description": "Part of the Customizable Build Pipeline tool for the iOS build target", "keywords": [ @@ -17,7 +17,7 @@ "type": "library", "dependencies": { "com.unitools.cli": "0.0.1-preview", - "com.unitools.io": "0.0.0", - "com.unitools.build": "0.0.0" + "com.unitools.io": "0.0.1-preview", + "com.unitools.build": "0.0.1-preview" } } \ No newline at end of file