Updated iOS SDK. FIxed events & Xcode build scripts DEV-280 (#8)

* Upgraded to iOS v1.0.1. Updated Xcode build scripts * Fix CI
ZapicInc · Feb 2, 2018 · 4745d6c · 4745d6c
1 parent 62f9528
commit 4745d6c
Show file tree

Hide file tree

Showing 12 changed files with 929 additions and 171 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: csharp
+mono: alpha
 dist: trusty
 sudo: required
 env:
   global:
-    - iOS_SDK="v1.0.0"
+    - iOS_SDK="v1.0.1"
     - android_SDK=""
 branches:
   only:

diff --git a/Assets/Zapic/Editor/iOSBuildSettings.cs b/Assets/Zapic/Editor/iOSBuildSettings.cs
@@ -3,85 +3,197 @@
 using UnityEditor.Callbacks;
 using System.Collections;
 using System.Text.RegularExpressions;
+using System.Reflection;
 #if UNITY_IOS
 using UnityEditor.iOS.Xcode;
+using UnityEditor.iOS.Xcode.Extensions;
 #endif
 using System.IO;
 
-public class iOSBuildSettings
+namespace Zapic
 {
-    [PostProcessBuild]
-    public static void OnPostprocessBuild(BuildTarget buildTarget, string pathToBuiltProject)
+    public class iOSBuildSettings
     {
+        [PostProcessBuild]
+        public static void OnPostprocessBuild(BuildTarget buildTarget, string pathToBuiltProject)
+        {
 #if UNITY_IOS
-        ConfigureXcodeSettings(buildTarget, pathToBuiltProject);
-        ConfigureXcodePlist(buildTarget, pathToBuiltProject);
+            ConfigureXcodeSettings(buildTarget, pathToBuiltProject);
+            ConfigureXcodePlist(buildTarget, pathToBuiltProject);
 #endif
-    }
+        }
 
 #if UNITY_IOS
-    private static void ConfigureXcodeSettings(BuildTarget buildTarget, string pathToBuiltProject)
-    {
-        if (buildTarget == BuildTarget.iOS)
+        private static void ConfigureXcodeSettings(BuildTarget buildTarget, string pathToBuiltProject)
         {
+            if (buildTarget != BuildTarget.iOS)
+                return;
+
             Debug.Log("Running Zapic Xcode Scripts");
 
-            string projPath = pathToBuiltProject + "/Unity-iPhone.xcodeproj/project.pbxproj";
+            string projPath = PBXProject.GetPBXProjectPath(pathToBuiltProject);// pathToBuiltProject + "/Unity-iPhone.xcodeproj/project.pbxproj";
 
+            //Find and load the xcode project
             var proj = new PBXProject();
             proj.ReadFromString(File.ReadAllText(projPath));
 
-            string targetGuid = proj.TargetGuidByName("Unity-iPhone");
+            //Find the unity target
+            string targetGuid = proj.TargetGuidByName(PBXProject.GetUnityTargetName());
 
+            //Force swift to be included
             Debug.Log("Zapic: Including Swift Libraries");
             proj.SetBuildProperty(targetGuid, "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES", "YES");
 
+            //Include the frameworks directory in search path to find Zapic.framework
             Debug.Log("Zapic: Setting search path");
             proj.SetBuildProperty(targetGuid, "LD_RUNPATH_SEARCH_PATHS", "$(inherited) @executable_path/Frameworks");
 
-            //Find the existing framework id
+            //Find the id for Zapic.framework fild
             var frameworkId = proj.FindFileGuidByProjectPath("Frameworks/Plugins/iOS/Zapic.framework");
 
-            //Try lowercase
-            if(string.IsNullOrEmpty(frameworkId)){
-                frameworkId = proj.FindFileGuidByProjectPath("Frameworks/Plugins/iOS/zapic.framework");
-            }
-
             if (string.IsNullOrEmpty(frameworkId))
             {
                 Debug.LogError("Zapic: Unable to find iOS framework");
             }
 
+            //Get or Add a copy files build phase
             Debug.Log("Zapic:Adding embedded frameworks");
-            string embedPhase = proj.AddCopyFilesBuildPhase(targetGuid, "Embed Frameworks", "", "10");
+
+            string embedPhase = proj.AddCopyFilesBuildPhase(targetGuid, "Embed Zapic Framework", "", "10");
 
             proj.AddFileToBuildSection(targetGuid, embedPhase, frameworkId);
 
-            // Apply settings
-            File.WriteAllText(projPath, proj.WriteToString());
+            const string ScriptName = "Strip Fat Library";
+
+            var scriptId = proj.ShellScriptByName(targetGuid, ScriptName);
+
+            if (string.IsNullOrEmpty(scriptId))
+                proj.AppendShellScriptBuildPhase(targetGuid, ScriptName, "/bin/sh", StripArchScript());
+
+
+            //Gets the entire project as a string
+            string contents = proj.WriteToString();
+
+            //Enable CodeSignOnCopy for the framework
+            contents = Regex.Replace(contents,
+                "(?<=Embed Frameworks)(?:.*)(\\/\\* Zapic\\.framework \\*\\/)(?=; };)",
+                m => m.Value.Replace("/* Zapic.framework */",
+                    "/* Zapic.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }"));
+
+            //Save the project file
+            File.WriteAllText(projPath, contents);
 
             Debug.Log("Zapic:Done configuring xcode settings");
         }
+
+        private static void ConfigureXcodePlist(BuildTarget buildTarget, string pathToBuiltProject)
+        {
+            if (buildTarget != BuildTarget.iOS)
+                return;
+
+            Debug.Log("Zapic:Configuring plist");
+
+            // Samlpe of editing Info.plist
+            var plistPath = Path.Combine(pathToBuiltProject, "Info.plist");
+            var plist = new PlistDocument();
+            plist.ReadFromFile(plistPath);
+
+            // Add string setting
+            plist.root.SetString("NSContactsUsageDescription", "We'll use your Contacts to find people you know on Zapic.");
+            plist.root.SetString("NSPhotoLibraryUsageDescription", "Zapic will only use the Photos you select.");
+
+            // Apply editing settings to Info.plist
+            plist.WriteToFile(plistPath);
+
+            Debug.Log("Zapic:Done configuring plist");
+        }
+
+        private static string StripArchScript()
+        {
+            return @"
+echo ""Target architectures: $ARCHS""
+
+APP_PATH=""${TARGET_BUILD_DIR}/${WRAPPER_NAME}""
+
+find ""$APP_PATH"" -name '*.framework' -type d | while read -r FRAMEWORK
+do
+FRAMEWORK_EXECUTABLE_NAME=$(defaults read ""$FRAMEWORK/Info.plist"" CFBundleExecutable)
+FRAMEWORK_EXECUTABLE_PATH=""$FRAMEWORK/$FRAMEWORK_EXECUTABLE_NAME""
+echo ""Executable is $FRAMEWORK_EXECUTABLE_PATH""
+echo $(lipo -info ""$FRAMEWORK_EXECUTABLE_PATH"")
+
+FRAMEWORK_TMP_PATH=""$FRAMEWORK_EXECUTABLE_PATH-tmp""
+
+# remove simulator's archs if location is not simulator's directory
+case ""${TARGET_BUILD_DIR}"" in
+*""iphonesimulator"")
+echo ""No need to remove archs""
+;;
+*)
+if $(lipo ""$FRAMEWORK_EXECUTABLE_PATH"" -verify_arch ""i386"") ; then
+lipo -output ""$FRAMEWORK_TMP_PATH"" -remove ""i386"" ""$FRAMEWORK_EXECUTABLE_PATH""
+echo ""i386 architecture removed""
+rm ""$FRAMEWORK_EXECUTABLE_PATH""
+mv ""$FRAMEWORK_TMP_PATH"" ""$FRAMEWORK_EXECUTABLE_PATH""
+fi
+if $(lipo ""$FRAMEWORK_EXECUTABLE_PATH"" -verify_arch ""x86_64"") ; then
+lipo -output ""$FRAMEWORK_TMP_PATH"" -remove ""x86_64"" ""$FRAMEWORK_EXECUTABLE_PATH""
+echo ""x86_64 architecture removed""
+rm ""$FRAMEWORK_EXECUTABLE_PATH""
+mv ""$FRAMEWORK_TMP_PATH"" ""$FRAMEWORK_EXECUTABLE_PATH""
+fi
+;;
+esac
+
+echo ""Completed for executable $FRAMEWORK_EXECUTABLE_PATH""
+echo $(lipo -info ""$FRAMEWORK_EXECUTABLE_PATH"")
+
+done
+            ";
+        }
+
+#endif
+
     }
 
-    private static void ConfigureXcodePlist(BuildTarget buildTarget, string pathToBuiltProject)
+    internal static class PBXExtensions
     {
-        Debug.Log("Zapic:Configuring plist");
+        /// <summary>
+        /// This is a hack to access the internal method. Replace this one unity makes it public
+        /// </summary>
+        /// <param name="project"></param>
+        /// <param name="targetGuid"></param>
+        /// <param name="name"></param>
+        /// <param name="shellPath"></param>
+        /// <param name="shellScript"></param>
+        public static void AppendShellScriptBuildPhase(this PBXProject project, string targetGuid, string name, string shellPath, string shellScript)
+        {
+            Debug.Log("Zapic: Adding Shell script");
 
-        // Samlpe of editing Info.plist
-        var plistPath = Path.Combine(pathToBuiltProject, "Info.plist");
-        var plist = new PlistDocument();
-        plist.ReadFromFile(plistPath);
+            MethodInfo dynMethod = project.GetType().GetMethod(
+                "AppendShellScriptBuildPhase",
+                BindingFlags.NonPublic | BindingFlags.Instance,
+                null,
+                CallingConventions.Any,
+                new System.Type[] { typeof(string), typeof(string), typeof(string), typeof(string) },
+                null);
 
-        // Add string setting
-        plist.root.SetString("NSContactsUsageDescription", "We'll use your Contacts to find people you know on Zapic.");
-        plist.root.SetString("NSPhotoLibraryUsageDescription", "Zapic will only use the Photos you select.");
+            dynMethod.Invoke(project, new object[] { targetGuid, name, shellPath, shellScript });
+        }
 
-        // Apply editing settings to Info.plist
-        plist.WriteToFile(plistPath);
+        public static string ShellScriptByName(this PBXProject project, string targetGuid, string name)
+        {
+            Debug.Log("Zapic: Getting Shell script");
 
-        Debug.Log("Zapic:Done configuring plist");
-    }
+            MethodInfo dynMethod = project.GetType().GetMethod(
+                "ShellScriptByName",
+                BindingFlags.NonPublic | BindingFlags.Instance);
 
-#endif
+            var result = dynMethod.Invoke(project, new object[] { targetGuid, name });
+
+            return result as string;
+        }
+    }
 }
+
+
diff --git a/Assets/Zapic/Examples/ExampleStartup.cs b/Assets/Zapic/Examples/ExampleStartup.cs
@@ -6,7 +6,7 @@ public class ExampleStartup : MonoBehaviour
 {
     void Start()
     {
-        Zapic.Start("v0.1");
+        Zapic.Start();
     }
 
     void Update()
@@ -17,7 +17,9 @@ void Update()
             {
                 {"SCORE",22},
                 {"PARAM2","abc"},
-                {"PARAM3",true}
+                {"PARAM3",true},
+                {"PARAM4","\"blab"},
+                 {"PAR\"AM5","\"blab"}
             };
 
             Zapic.SubmitEvent(p);

diff --git a/Assets/Zapic/IZapicInterface.cs b/Assets/Zapic/IZapicInterface.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+
+namespace ZapicSDK
+{
+    internal interface IZapicInterface
+    {
+        /// <summary>
+        /// Starts zapic. This should be called
+        /// as soon as possible during app startup.
+        /// </summary>
+        void Start();
+
+        /// <summary>
+        /// Shows the given zapic window
+        /// </summary>
+        /// <param name="view">View to show.</param>
+        void Show(Views view);
+
+        /// <summary>
+        /// Gets the current players unique id.
+        /// </summary>
+        /// <returns>The unique id.</returns>
+        string PlayerId();
+
+        /// <summary>
+        /// Submit a new in-game event to zapic.
+        /// </summary>
+        /// <param name="param">Collection of parameter names and associate values (numeric, string, bool)</param>
+        void SubmitEvent(Dictionary<string, object> param);
+    }
+}