Merge pull request #85 from OneSignal/fix_ios

Fix Cloud Build Issue

Author: Nightsd01

OneSignalExample/Assets/OneSignal/Editor/PostProcessBuildPlayer_iOS.cs

@@ -0,0 +1,61 @@
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.Callbacks;
+using System.Collections;
+using System.IO;
+
+#if UNITY_IPHONE && UNITY_EDITOR
+
+public struct framework {
+   public string name;
+   public string id;
+   public string fileId;
+
+   public framework(string fName, string fId, string fFileid) {
+      name = fName;
+      id = fId;
+      fileId = fFileid;
+   }
+}
+
+/*
+   Adds required frameworks (currently just UserNotifications.framework) to the iOS project
+   To add further frameworks in the build process, just add a new framework to the Frameworks array
+*/
+
+public class PostBuildTrigger {
+
+   [PostProcessBuild]
+   public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject) {
+      LinkLibraries(target, pathToBuiltProject);
+   }
+
+   public static void LinkLibraries(BuildTarget target, string pathToBuiltProject) {
+      framework[] frameworksToAdd = new framework[1];
+      
+      frameworksToAdd[0] = new framework("UserNotifications", "CAF63D112040CD8E00A651DC", "CAF63D102040CD8E00A651DC");
+      
+      string projectFile = pathToBuiltProject + "/Unity-iPhone.xcodeproj/project.pbxproj";
+      string contents = File.ReadAllText(projectFile);
+      
+      foreach (framework framework in frameworksToAdd) {
+         AddFrameworkToProject(framework, ref contents);
+      }
+
+      File.WriteAllText(projectFile, contents);
+   }
+
+   public static void AddFrameworkToProject(framework framework, ref string contents) {
+      string orientationSupport = "Ref = 8AC71EC319E7FBA90027502F /* OrientationSupport.mm */; };";
+      string pbxFileReference = "wnFileType = text.plist.xml; path = Info.plist; sourceTree = \"<group>\"; };";
+      string pbsFrameworksBuildPhase = "1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,";
+      string frameworksSection = "1D30AB110D05D00D00671497 /* Foundation.framework */,";
+      
+      contents = contents.Replace(orientationSupport, orientationSupport + "\n\t\t" + framework.id + " /* " + framework.name + ".framework in Frameworks */ = {isa = PBXBuildFile; fileRef = " + framework.fileId + " /* " + framework.name + ".framework */; };");
+      contents = contents.Replace(pbxFileReference, pbxFileReference + "\n\t\t" + framework.fileId + " /* " + framework.name + ".framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = " + framework.name + ".framework; path = System/Library/Frameworks/" + framework.name + ".framework; sourceTree = SDKROOT; };");
+      contents = contents.Replace(pbsFrameworksBuildPhase, framework.id + " /* " + framework.name + ".framework in Frameworks */,\n\t\t\t\t" + pbsFrameworksBuildPhase);
+      contents = contents.Replace(frameworksSection, framework.fileId + " /* " + framework.name + ".framework */,\n\t\t\t\t" + frameworksSection);
+   }
+}
+
+#endif

OneSignalExample/Assets/OneSignal/Editor/PostProcessBuildPlayer_iOS.cs.meta

@@ -90,8 +90,8 @@ public class OneSignalIOS : OneSignalPlatform {
 
    [System.Runtime.InteropServices.DllImport("__Internal")]
    extern static public void _addEmailSubscriptionObserver();
-
-   [System.Runtime.InteropServices.DllImport("__Internal")];
+   
+   [System.Runtime.InteropServices.DllImport("__Internal")]
    extern static public void _removeEmailSubscriptionObserver();
 
    [System.Runtime.InteropServices.DllImport("__Internal")]
@@ -215,6 +215,10 @@ public OSPermissionStateChanges parseOSPermissionStateChanges(string jsonStat) {
       return OneSignalPlatformHelper.parseOSPermissionStateChanges(this, jsonStat);
    }
 
+	public OSEmailSubscriptionStateChanges parseOSEmailSubscriptionStateChanges(string jsonState) {
+		return OneSignalPlatformHelper.parseOSEmailSubscriptionStateChanges (this, jsonState);
+	}
+
    public OSSubscriptionStateChanges parseOSSubscriptionStateChanges(string jsonStat) {
       return OneSignalPlatformHelper.parseOSSubscriptionStateChanges(this, jsonStat);
    }
@@ -252,4 +256,4 @@ public OSEmailSubscriptionState parseOSEmailSubscriptionState(object stateDict)
       return state;
    }
 }
-#endif
+#endif

OneSignalExample/Assets/OneSignal/src/OneSignalIOS.cs

@@ -183,7 +183,7 @@ PlayerSettings:
     serializedVersion: 2
     m_Bits: 238
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 7.0
+  iOSTargetOSVersionString: 9.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
   tvOSTargetOSVersionString: 9.0
@@ -703,7 +703,7 @@ PlayerSettings:
   webGLCompressionFormat: 1
   scriptingDefineSymbols: {}
   platformArchitecture:
-    iOS: 0
+    iOS: 2
   scriptingBackend:
     Android: 0
     Metro: 2