Auto stash before merge of "master" and "github/master"

.gitignore

@@ -48,3 +48,7 @@ Assets/Plugins/
 Assets/Plugins\.meta
 
 unity\.log
+
+ICSharpCode\.SharpZipLib\.dll
+
+UnityPacker\.exe

Assets/Zapic/Editor/iOSBuildSettings.cs

@@ -42,18 +42,27 @@ private static void ConfigureXcodeSettings(BuildTarget buildTarget, string pathT
             //Find the existing framework id
             var frameworkId = proj.FindFileGuidByProjectPath("Frameworks/Plugins/iOS/Zapic.framework");
 
+            if (string.IsNullOrEmpty(frameworkId))
+            {
+                Debug.LogError("Zapic: Unable to find iOS framework");
+            }
+
             Debug.Log("Zapic:Adding embedded frameworks");
             string embedPhase = proj.AddCopyFilesBuildPhase(targetGuid, "Embed Frameworks", "", "10");
 
             proj.AddFileToBuildSection(targetGuid, embedPhase, frameworkId);
 
             // Apply settings
             File.WriteAllText(projPath, proj.WriteToString());
+
+            Debug.Log("Zapic:Done configuring xcode settings");
         }
     }
 
     private static void ConfigureXcodePlist(BuildTarget buildTarget, string pathToBuiltProject)
     {
+        Debug.Log("Zapic:Configuring plist");
+
         // Samlpe of editing Info.plist
         var plistPath = Path.Combine(pathToBuiltProject, "Info.plist");
         var plist = new PlistDocument();
@@ -65,6 +74,8 @@ private static void ConfigureXcodePlist(BuildTarget buildTarget, string pathToBu
 
         // Apply editing settings to Info.plist
         plist.WriteToFile(plistPath);
+
+        Debug.Log("Zapic:Done configuring plist");
     }
 
 #endif

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2017.1.0f3
+m_EditorVersion: 2017.2.0f3

Scripts/exportPackage.sh

@@ -21,6 +21,6 @@ echo ""
 wget https://github.com/FatihBAKIR/UnityPacker/releases/download/0.0.1/UnityPacker.exe ;
 wget https://github.com/FatihBAKIR/UnityPacker/releases/download/0.0.1/ICSharpCode.SharpZipLib.dll ;
 chmod +x UnityPacker.exe ;
-./UnityPacker.exe Assets Zapic no "Assets/Zapic/" "gitignore,md,exe,dll" ".git" ;
+./UnityPacker.exe Assets Zapic no "." "gitignore,md,exe,dll" ".git" ;
 # mv QuarkDefault.unitypackage ~ ;
 # rm -rf /tmp/Quark.Default ;