com.onesignal.unity.ios 5.1.15 → 5.1.16

package/Editor/BuildPostProcessor.cs

@@ -61,23 +61,36 @@ using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEditor.iOS.Xcode.Extensions;
 using Debug = UnityEngine.Debug;
-
 using UnityEditor.Callbacks;
 
-namespace OneSignalSDK.iOS {
+namespace OneSignalSDK.iOS
+{
     /// <summary>
     /// Adds required frameworks to the iOS project, and adds the OneSignalNotificationServiceExtension. Also handles
     /// making sure both targets (app and extension service) have the correct dependencies
     /// </summary>
-    public class BuildPostProcessor : IPostprocessBuildWithReport {
+    public class BuildPostProcessor : IPostprocessBuildWithReport
+    {
         private const string ServiceExtensionTargetName = "OneSignalNotificationServiceExtension";
         private const string ServiceExtensionFilename = "NotificationService.swift";
         private const string DependenciesFilename = "OneSignaliOSDependencies.xml";
         private const string PackageName = "com.onesignal.unity.ios";
 
-        private static readonly string EditorFilesPath = Path.Combine("Packages", PackageName, "Editor");
-        private static readonly string PluginLibrariesPath = Path.Combine(PackageName, "Runtime", "Plugins", "iOS");
-        private static readonly string PluginFilesPath = Path.Combine("Packages", PluginLibrariesPath);
+        private static readonly string EditorFilesPath = Path.Combine(
+            "Packages",
+            PackageName,
+            "Editor"
+        );
+        private static readonly string PluginLibrariesPath = Path.Combine(
+            PackageName,
+            "Runtime",
+            "Plugins",
+            "iOS"
+        );
+        private static readonly string PluginFilesPath = Path.Combine(
+            "Packages",
+            PluginLibrariesPath
+        );
 
         private string _outputPath;
         private string _projectPath;
@@ -96,18 +109,19 @@ namespace OneSignalSDK.iOS {
         /// <summary>
         /// Entry for the build post processing necessary to get the OneSignal SDK iOS up and running
         /// </summary>
-        public void OnPostprocessBuild(BuildReport report) {
+        public void OnPostprocessBuild(BuildReport report)
+        {
             if (report.summary.platform != BuildTarget.iOS)
                 return;
 
             // Load the project
-            _outputPath  = report.summary.outputPath;
+            _outputPath = report.summary.outputPath;
             _projectPath = PBXProject.GetPBXProjectPath(_outputPath);
             _project.ReadFromString(File.ReadAllText(_projectPath));
-            
+
             // Turn on capabilities required by OneSignal
             AddProjectCapabilities();
-            
+
             // Add the service extension
             AddNotificationServiceExtension();
 
@@ -120,22 +134,31 @@ namespace OneSignalSDK.iOS {
         /// <summary>
         /// Get existing entitlements file if exists or creates a new file, adds it to the project, and returns the path
         /// </summary>
-        private string GetEntitlementsPath(string targetGuid, string targetName) {
-            var relativePath = _project.GetBuildPropertyForAnyConfig(targetGuid, "CODE_SIGN_ENTITLEMENTS");
+        private string GetEntitlementsPath(string targetGuid, string targetName)
+        {
+            var relativePath = _project.GetBuildPropertyForAnyConfig(
+                targetGuid,
+                "CODE_SIGN_ENTITLEMENTS"
+            );
 
-            if (relativePath != null) {
+            if (relativePath != null)
+            {
                 var fullPath = Path.Combine(_outputPath, relativePath);
 
                 if (File.Exists(fullPath))
                     return fullPath;
             }
-            
-            var entitlementsPath = Path.Combine(_outputPath, targetName, $"{targetName}.entitlements");
-            
+
+            var entitlementsPath = Path.Combine(
+                _outputPath,
+                targetName,
+                $"{targetName}.entitlements"
+            );
+
             // make new file
             var entitlementsPlist = new PlistDocument();
             entitlementsPlist.WriteToFile(entitlementsPath);
-            
+
             // Copy the entitlement file to the xcode project
             var entitlementFileName = Path.GetFileName(entitlementsPath);
             var relativeDestination = targetName + "/" + entitlementFileName;
@@ -146,28 +169,34 @@ namespace OneSignalSDK.iOS {
 
             return relativeDestination;
         }
-        
+
         /// <summary>
         /// Add the required capabilities and entitlements for OneSignal
         /// </summary>
-        private void AddProjectCapabilities() {
+        private void AddProjectCapabilities()
+        {
             var targetGuid = _project.GetMainTargetGuid();
             var targetName = _project.GetMainTargetName();
 
             var entitlementsPath = GetEntitlementsPath(targetGuid, targetName);
-            var projCapability = new ProjectCapabilityManager(_projectPath, entitlementsPath, targetName);
+            var projCapability = new ProjectCapabilityManager(
+                _projectPath,
+                entitlementsPath,
+                targetName
+            );
 
             projCapability.AddBackgroundModes(BackgroundModesOptions.RemoteNotifications);
             projCapability.AddPushNotifications(false);
             projCapability.AddAppGroups(new[] { _appGroupName });
-            
+
             projCapability.WriteToFile();
         }
-        
+
         /// <summary>
         /// Create and add the notification extension to the project
         /// </summary>
-        private void AddNotificationServiceExtension() {
+        private void AddNotificationServiceExtension()
+        {
 #if !UNITY_CLOUD_BUILD
             // refresh plist and podfile on appends
             ExtensionCreatePlist(_outputPath);
@@ -179,9 +208,12 @@ namespace OneSignalSDK.iOS {
             if (!string.IsNullOrEmpty(extensionGuid))
                 return;
 
-            extensionGuid = _project.AddAppExtension(_project.GetMainTargetGuid(),
+            extensionGuid = _project.AddAppExtension(
+                _project.GetMainTargetGuid(),
                 ServiceExtensionTargetName,
-                PlayerSettings.GetApplicationIdentifier(BuildTargetGroup.iOS) + "." + ServiceExtensionTargetName,
+                PlayerSettings.GetApplicationIdentifier(BuildTargetGroup.iOS)
+                    + "."
+                    + ServiceExtensionTargetName,
                 ServiceExtensionTargetName + "/" + "Info.plist" // Unix path as it's used by Xcode
             );
 
@@ -192,20 +224,31 @@ namespace OneSignalSDK.iOS {
             _project.SetBuildProperty(extensionGuid, "IPHONEOS_DEPLOYMENT_TARGET", "10.0");
             _project.SetBuildProperty(extensionGuid, "SWIFT_VERSION", "5.0");
             _project.SetBuildProperty(extensionGuid, "ARCHS", "arm64");
-            _project.SetBuildProperty(extensionGuid, "DEVELOPMENT_TEAM", PlayerSettings.iOS.appleDeveloperTeamID);
+            _project.SetBuildProperty(
+                extensionGuid,
+                "DEVELOPMENT_TEAM",
+                PlayerSettings.iOS.appleDeveloperTeamID
+            );
             _project.SetBuildProperty(extensionGuid, "ENABLE_BITCODE", "NO");
 
-            _project.AddBuildProperty(extensionGuid, "LIBRARY_SEARCH_PATHS",
-                $"$(PROJECT_DIR)/Libraries/{PluginLibrariesPath.Replace("\\", "/")}");
+            _project.AddBuildProperty(
+                extensionGuid,
+                "LIBRARY_SEARCH_PATHS",
+                $"$(PROJECT_DIR)/Libraries/{PluginLibrariesPath.Replace("\\", "/")}"
+            );
 
             _project.WriteToFile(_projectPath);
 
             // add capabilities + entitlements
             var entitlementsPath = GetEntitlementsPath(extensionGuid, ServiceExtensionTargetName);
-            var projCapability = new ProjectCapabilityManager(_projectPath, entitlementsPath, ServiceExtensionTargetName);
-            
+            var projCapability = new ProjectCapabilityManager(
+                _projectPath,
+                entitlementsPath,
+                ServiceExtensionTargetName
+            );
+
             projCapability.AddAppGroups(new[] { _appGroupName });
-            
+
             projCapability.WriteToFile();
 #endif
         }
@@ -213,80 +256,109 @@ namespace OneSignalSDK.iOS {
         /// <summary>
         /// Add the swift source file required by the notification extension
         /// </summary>
-        private void ExtensionAddSourceFiles(string extensionGuid) {
-            var buildPhaseID     = _project.AddSourcesBuildPhase(extensionGuid);
-            var sourcePath       = Path.Combine(PluginFilesPath, ServiceExtensionFilename);
-            var destPathRelative = Path.Combine(ServiceExtensionTargetName, ServiceExtensionFilename);
+        private void ExtensionAddSourceFiles(string extensionGuid)
+        {
+            var buildPhaseID = _project.AddSourcesBuildPhase(extensionGuid);
+            var sourcePath = Path.Combine(PluginFilesPath, ServiceExtensionFilename);
+            var destPathRelative = Path.Combine(
+                ServiceExtensionTargetName,
+                ServiceExtensionFilename
+            );
 
             var destPath = Path.Combine(_outputPath, destPathRelative);
             if (!File.Exists(destPath))
-                FileUtil.CopyFileOrDirectory(sourcePath.Replace("\\", "/"), destPath.Replace("\\", "/"));
+                FileUtil.CopyFileOrDirectory(
+                    sourcePath.Replace("\\", "/"),
+                    destPath.Replace("\\", "/")
+                );
 
             var sourceFileGuid = _project.AddFile(destPathRelative, destPathRelative);
             _project.AddFileToBuildSection(extensionGuid, buildPhaseID, sourceFileGuid);
         }
-        
+
         /// <summary>
         /// Create a .plist file for the extension
         /// </summary>
         /// <remarks>NOTE: File in Xcode project is replaced everytime, never appends</remarks>
-        private bool ExtensionCreatePlist(string path) {
+        private bool ExtensionCreatePlist(string path)
+        {
             var extensionPath = Path.Combine(path, ServiceExtensionTargetName);
             Directory.CreateDirectory(extensionPath);
 
-            var plistPath     = Path.Combine(extensionPath, "Info.plist");
+            var plistPath = Path.Combine(extensionPath, "Info.plist");
             var alreadyExists = File.Exists(plistPath);
 
             var notificationServicePlist = new PlistDocument();
             notificationServicePlist.ReadFromFile(Path.Combine(PluginFilesPath, "Info.plist"));
-            notificationServicePlist.root.SetString("CFBundleShortVersionString", PlayerSettings.bundleVersion);
-            notificationServicePlist.root.SetString("CFBundleVersion", PlayerSettings.iOS.buildNumber);
+            notificationServicePlist.root.SetString(
+                "CFBundleShortVersionString",
+                PlayerSettings.bundleVersion
+            );
+            notificationServicePlist.root.SetString(
+                "CFBundleVersion",
+                PlayerSettings.iOS.buildNumber
+            );
 
             notificationServicePlist.WriteToFile(plistPath);
-            
+
             return alreadyExists;
         }
 
-        private void ExtensionAddPodsToTarget() {
+        private void ExtensionAddPodsToTarget()
+        {
             var podfilePath = Path.Combine(_outputPath, "Podfile");
 
-            if (!File.Exists(podfilePath)) {
-                Debug.LogError($"Could not find Podfile. {ServiceExtensionFilename} will have errors.");
+            if (!File.Exists(podfilePath))
+            {
+                Debug.LogError(
+                    $"Could not find Podfile. {ServiceExtensionFilename} will have errors."
+                );
                 return;
             }
 
             var dependenciesFilePath = Path.Combine(EditorFilesPath, DependenciesFilename);
 
-            if (!File.Exists(dependenciesFilePath)) {
+            if (!File.Exists(dependenciesFilePath))
+            {
                 Debug.LogError($"Could not find {DependenciesFilename}");
                 return;
             }
-            
+
             var dependenciesFile = File.ReadAllText(dependenciesFilePath);
-            var dependenciesRegex = new Regex("(?<=<iosPod name=\"OneSignalXCFramework\" version=\").+(?=\" addToAllTargets=\"true\" />)");
+            var dependenciesRegex = new Regex(
+                "(?<=<iosPod name=\"OneSignalXCFramework\" version=\").+(?=\" addToAllTargets=\"true\" />)"
+            );
 
-            if (!dependenciesRegex.IsMatch(dependenciesFile)) {
-                Debug.LogError($"Could not read current iOS framework dependency version from {DependenciesFilename}");
+            if (!dependenciesRegex.IsMatch(dependenciesFile))
+            {
+                Debug.LogError(
+                    $"Could not read current iOS framework dependency version from {DependenciesFilename}"
+                );
                 return;
             }
 
             var podfile = File.ReadAllText(podfilePath);
-            var podfileRegex = new Regex($@"target '{ServiceExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '(.+)'\nend\n");
-            
+            var podfileRegex = new Regex(
+                $@"target '{ServiceExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '(.+)'\nend\n"
+            );
+
             var requiredVersion = dependenciesRegex.Match(dependenciesFile).ToString();
-            var requiredTarget = $"target '{ServiceExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '{requiredVersion}'\nend\n";
+            var requiredTarget =
+                $"target '{ServiceExtensionTargetName}' do\n  pod 'OneSignalXCFramework', '{requiredVersion}'\nend\n";
 
             if (!podfileRegex.IsMatch(podfile))
                 podfile += requiredTarget;
-            else {
+            else
+            {
                 var podfileTarget = podfileRegex.Match(podfile).ToString();
                 podfile = podfile.Replace(podfileTarget, requiredTarget);
             }
-            
+
             File.WriteAllText(podfilePath, podfile);
         }
 
-        private void DisableBitcode() {
+        private void DisableBitcode()
+        {
             // Main
             var targetGuid = _project.GetMainTargetGuid();
             _project.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");
@@ -301,4 +373,4 @@ namespace OneSignalSDK.iOS {
         }
     }
 }
-#endif
+#endif

package/Editor/OneSignaliOSDependencies.xml

@@ -1,5 +1,5 @@
 <dependencies>
-    <iosPods>
-            <iosPod name="OneSignalXCFramework" version="5.2.14" addToAllTargets="true" />
-    </iosPods>
-</dependencies>
+  <iosPods>
+    <iosPod name="OneSignalXCFramework" version="5.2.16" addToAllTargets="true" />
+  </iosPods>
+</dependencies>

package/Editor/PBXProjectExtensions.cs

@@ -28,21 +28,22 @@
 #if UNITY_IOS
 using UnityEditor.iOS.Xcode;
 
-namespace OneSignalSDK.iOS {
-    public static class PBXProjectExtensions {
-    #if UNITY_2019_3_OR_NEWER
-        public static string GetMainTargetName(this PBXProject project)
-            => "Unity-iPhone";
+namespace OneSignalSDK.iOS
+{
+    public static class PBXProjectExtensions
+    {
+#if UNITY_2019_3_OR_NEWER
+        public static string GetMainTargetName(this PBXProject project) => "Unity-iPhone";
 
-        public static string GetMainTargetGuid(this PBXProject project)
-            => project.GetUnityMainTargetGuid();
-    #else
-        public static string GetMainTargetName(this PBXProject project) 
-            => PBXProject.GetUnityTargetName();
-         
-        public static string GetMainTargetGuid(this PBXProject project)
-             => project.TargetGuidByName(PBXProject.GetUnityTargetName());
-    #endif
+        public static string GetMainTargetGuid(this PBXProject project) =>
+            project.GetUnityMainTargetGuid();
+#else
+        public static string GetMainTargetName(this PBXProject project) =>
+            PBXProject.GetUnityTargetName();
+
+        public static string GetMainTargetGuid(this PBXProject project) =>
+            project.TargetGuidByName(PBXProject.GetUnityTargetName());
+#endif
     }
 }
-#endif
+#endif

package/Runtime/AssemblyInfo.cs

@@ -27,4 +27,4 @@
 
 using UnityEngine.Scripting;
 
-[assembly: AlwaysLinkAssembly]
+[assembly: AlwaysLinkAssembly]

package/Runtime/OneSignaliOS.cs

@@ -25,35 +25,51 @@
  * THE SOFTWARE.
  */
 
-using UnityEngine;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.InteropServices;
-using OneSignalSDK.Notifications;
-using OneSignalSDK.InAppMessages;
+using System.Threading.Tasks;
 using OneSignalSDK.Debug;
 using OneSignalSDK.Debug.Utilities;
-using OneSignalSDK.Location;
-using OneSignalSDK.Session;
-using OneSignalSDK.User;
-using OneSignalSDK.LiveActivities;
-using OneSignalSDK.iOS.Notifications;
-using OneSignalSDK.iOS.InAppMessages;
+using OneSignalSDK.InAppMessages;
 using OneSignalSDK.iOS.Debug;
+using OneSignalSDK.iOS.InAppMessages;
+using OneSignalSDK.iOS.LiveActivities;
 using OneSignalSDK.iOS.Location;
+using OneSignalSDK.iOS.Notifications;
 using OneSignalSDK.iOS.Session;
 using OneSignalSDK.iOS.User;
-using OneSignalSDK.iOS.LiveActivities;
+using OneSignalSDK.LiveActivities;
+using OneSignalSDK.Location;
+using OneSignalSDK.Notifications;
+using OneSignalSDK.Session;
+using OneSignalSDK.User;
+using UnityEngine;
+
+namespace OneSignalSDK.iOS
+{
+    public sealed partial class OneSignaliOS : OneSignalPlatform
+    {
+        [DllImport("__Internal")]
+        private static extern void _oneSignalSetConsentGiven(bool consent);
+
+        [DllImport("__Internal")]
+        private static extern void _oneSignalSetConsentRequired(bool required);
+
+        [DllImport("__Internal")]
+        private static extern void _oneSignalInitialize(string appId);
 
-namespace OneSignalSDK.iOS {
-    public sealed partial class OneSignaliOS : OneSignalPlatform {
-        [DllImport("__Internal")] private static extern void _oneSignalSetConsentGiven(bool consent);
-        [DllImport("__Internal")] private static extern void _oneSignalSetConsentRequired(bool required);
-        [DllImport("__Internal")] private static extern void _oneSignalInitialize(string appId);
-        [DllImport("__Internal")] private static extern void _oneSignalLogin(string externalId);
-        [DllImport("__Internal")] private static extern void _oneSignalLoginWithJwtBearerToken(string externalId, string jwtBearerToken);
-        [DllImport("__Internal")] private static extern void _oneSignalLogout();
+        [DllImport("__Internal")]
+        private static extern void _oneSignalLogin(string externalId);
+
+        [DllImport("__Internal")]
+        private static extern void _oneSignalLoginWithJwtBearerToken(
+            string externalId,
+            string jwtBearerToken
+        );
+
+        [DllImport("__Internal")]
+        private static extern void _oneSignalLogout();
 
         private iOSUserManager _user;
         private iOSSessionManager _session;
@@ -68,8 +84,10 @@ namespace OneSignalSDK.iOS {
         /// <summary>
         /// Used to provide a reference for and sets up the global callbacks
         /// </summary>
-        public OneSignaliOS() {
-            if (_instance != null) {
+        public OneSignaliOS()
+        {
+            if (_instance != null)
+            {
                 SDKDebug.Error("Additional instance of OneSignaliOS created.");
                 return;
             }
@@ -78,85 +96,106 @@ namespace OneSignalSDK.iOS {
             _debug = new iOSDebugManager();
         }
 
-        public override IUserManager User {
+        public override IUserManager User
+        {
             get => _user;
         }
 
-        public override ISessionManager Session {
+        public override ISessionManager Session
+        {
             get => _session;
         }
 
-        public override INotificationsManager Notifications {
+        public override INotificationsManager Notifications
+        {
             get => _notifications;
         }
 
-        public override ILocationManager Location {
+        public override ILocationManager Location
+        {
             get => _location;
         }
 
-        public override IInAppMessagesManager InAppMessages {
+        public override IInAppMessagesManager InAppMessages
+        {
             get => _inAppMessages;
         }
 
-        public override IDebugManager Debug {
+        public override IDebugManager Debug
+        {
             get => _debug;
         }
 
-        public override ILiveActivitiesManager LiveActivities {
+        public override ILiveActivitiesManager LiveActivities
+        {
             get => _liveActivities;
         }
 
-        public override bool ConsentGiven {
+        public override bool ConsentGiven
+        {
             set => _oneSignalSetConsentGiven(value);
         }
 
-        public override bool ConsentRequired {
+        public override bool ConsentRequired
+        {
             set => _oneSignalSetConsentRequired(value);
         }
 
-        public override void Initialize(string appId) {
+        public override void Initialize(string appId)
+        {
             _oneSignalInitialize(appId);
 
-            if (_inAppMessages == null) {
+            if (_inAppMessages == null)
+            {
                 _inAppMessages = new iOSInAppMessagesManager();
                 _inAppMessages.Initialize();
             }
 
-            if (_notifications == null) {
+            if (_notifications == null)
+            {
                 _notifications = new iOSNotificationsManager();
                 _notifications.Initialize();
             }
 
-            if (_user == null) {
+            if (_user == null)
+            {
                 _user = new iOSUserManager();
                 _user.Initialize();
             }
 
-            if (_location == null) {
+            if (_location == null)
+            {
                 _location = new iOSLocationManager();
             }
 
-            if (_session == null) {
+            if (_session == null)
+            {
                 _session = new iOSSessionManager();
             }
 
-            if (_liveActivities == null) {
+            if (_liveActivities == null)
+            {
                 _liveActivities = new iOSLiveActivitiesManager();
             }
 
             _completedInit(appId);
         }
 
-        public override void Login(string externalId, string jwtBearerToken = null) {
-            if (jwtBearerToken == null) {
+        public override void Login(string externalId, string jwtBearerToken = null)
+        {
+            if (jwtBearerToken == null)
+            {
                 _oneSignalLogin(externalId);
-            } else {
+            }
+            else
+            {
                 _oneSignalLoginWithJwtBearerToken(externalId, jwtBearerToken);
             }
         }
 
-        public override void Logout() {
+        public override void Logout()
+        {
             _oneSignalLogout();
         }
     }
-}
+}

package/Runtime/Plugins/iOS/UIApplication+OneSignalUnity.mm

@@ -97,7 +97,7 @@ static bool swizzled = false;
 
 - (BOOL)oneSignalApplication:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     [OneSignalWrapper setSdkType:@"unity"];
-    [OneSignalWrapper setSdkVersion:@"050115"];
+    [OneSignalWrapper setSdkVersion:@"005116"];
     [OneSignal initialize:nil withLaunchOptions:launchOptions];
 
     if ([self respondsToSelector:@selector(oneSignalApplication:didFinishLaunchingWithOptions:)])