Platform-Dependent Directory Separator Character (#139)

• Switches away from using hardcoded directory separator characters to using platform-dependent separators in the build script and update checker script

Author: Nightsd01

OneSignalExample/Assets/OneSignal/Editor/OneSignalEditorCheckUpdateScript.cs

@@ -97,12 +97,14 @@ IEnumerator FetchCurrentVersion(string url)
          //since there was an error, we shouldn't attempt to serialize data from the request
          yield break;
       }
+      
+      var separator = Path.DirectorySeparatorChar;
 
       //parse JSON to extract the latest version
       var json = Json.Deserialize(request.downloadHandler.text) as System.Collections.Generic.Dictionary<string, object>;
 
       var latestVersionString = (json["tag_name"] as string);
-      var currentVersionString = File.ReadAllText("Assets/OneSignal/VERSION").Replace("\n", "");
+      var currentVersionString = File.ReadAllText("Assets" + separator + "OneSignal" + separator + "VERSION").Replace("\n", "");
 
       //remove . to convert "2.8.2" to "282" for example
       var latestVersion = int.Parse(latestVersionString.Replace(".", ""));

OneSignalExample/Assets/OneSignal/Editor/PostProcessBuildPlayer_iOS.cs

@@ -25,6 +25,8 @@ public class BuildPostProcessor
       [PostProcessBuildAttribute(1)]
       public static void OnPostProcessBuild(BuildTarget target, string path)
       {
+         var separator = Path.DirectorySeparatorChar;
+         
          string projectPath = PBXProject.GetPBXProjectPath(path);
          PBXProject project = new PBXProject();
 
@@ -34,13 +36,14 @@ public static void OnPostProcessBuild(BuildTarget target, string path)
 
          // UserNotifications.framework is required by libOneSignal.a
          project.AddFrameworkToProject(targetGUID, "UserNotifications.framework", false);
-
+        
          #if UNITY_2017_2_OR_NEWER && !UNITY_CLOUD_BUILD
-
+           
+            var platformsLocation = "Assets" + separator + "OneSignal" + separator + "Platforms" + separator;
             var extensionTargetName = "OneSignalNotificationServiceExtension";
-            var pathToNotificationService = path + "/" + extensionTargetName;
+            var pathToNotificationService = path + separator + extensionTargetName;
 
-            var notificationServicePlistPath = pathToNotificationService + "/Info.plist";
+            var notificationServicePlistPath = pathToNotificationService + separator + "Info.plist";
 
             //if this is a rebuild, we've already added the extension service, no need to run this script a second time
             if (File.Exists(notificationServicePlistPath))
@@ -49,13 +52,13 @@ public static void OnPostProcessBuild(BuildTarget target, string path)
             Directory.CreateDirectory(pathToNotificationService);
 
             PlistDocument notificationServicePlist = new PlistDocument();
-            notificationServicePlist.ReadFromFile ("Assets/OneSignal/Platforms/iOS/Info.plist");
+            notificationServicePlist.ReadFromFile (platformsLocation + "iOS" + separator + "Info.plist");
             notificationServicePlist.root.SetString ("CFBundleShortVersionString", PlayerSettings.bundleVersion);
             notificationServicePlist.root.SetString ("CFBundleVersion", PlayerSettings.iOS.buildNumber.ToString ());
 
             var notificationServiceTarget = PBXProjectExtensions.AddAppExtension (project, targetGUID, extensionTargetName, PlayerSettings.GetApplicationIdentifier (BuildTargetGroup.iOS) + "." + extensionTargetName, notificationServicePlistPath);
 
-            var sourceDestination = extensionTargetName + "/NotificationService";
+            var sourceDestination = extensionTargetName + separator + "NotificationService";
 
             project.AddFileToBuild (notificationServiceTarget, project.AddFile (sourceDestination + ".h", sourceDestination + ".h", PBXSourceTree.Source));
             project.AddFileToBuild (notificationServiceTarget, project.AddFile (sourceDestination + ".m", sourceDestination + ".m", PBXSourceTree.Source));
@@ -76,8 +79,8 @@ public static void OnPostProcessBuild(BuildTarget target, string path)
             notificationServicePlist.WriteToFile (notificationServicePlistPath);
 
             foreach (string type in new string[] { "m", "h" })
-               if (!File.Exists(path + "/" + sourceDestination + "." + type))
-                  FileUtil.CopyFileOrDirectory("Assets/OneSignal/Platforms/iOS/NotificationService.h", path + "/" + sourceDestination + "." + type);
+               if (!File.Exists(path + separator + sourceDestination + "." + type))
+                  FileUtil.CopyFileOrDirectory(platformsLocation + "iOS" + separator + "NotificationService.h", path + separator + sourceDestination + "." + type);
 
             project.WriteToFile (projectPath);
 
@@ -97,7 +100,7 @@ public static void OnPostProcessBuild(BuildTarget target, string path)
 
          // enable the Notifications capability in the main app target
          project.ReadFromString(contents);
-         var entitlementPath = path + "/" + targetName + "/" + targetName + ".entitlements";
+         var entitlementPath = path + separator + targetName + separator + targetName + ".entitlements";
 
          PlistDocument entitlements = new PlistDocument();
          entitlements.root.SetString("aps-environment", "development");
@@ -112,7 +115,7 @@ public static void OnPostProcessBuild(BuildTarget target, string path)
          // Copy the entitlement file to the xcode project
          var entitlementFileName = Path.GetFileName(entitlementPath);
          var unityTarget = PBXProject.GetUnityTargetName();
-         var relativeDestination = unityTarget + "/" + entitlementFileName;
+         var relativeDestination = unityTarget + separator + entitlementFileName;
 
          // Add the pbx configs to include the entitlements files on the project
          project.AddFile(relativeDestination, entitlementFileName);