Merge pull request #557 from OneSignal/release/3.0.6

Release 3.0.6

Author: shepherd-l

OneSignalExample/Assets/OneSignal/CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [3.0.6]
+### Fixed
+- Android builds failing without the Unity iOS module
+- Fixed app group name to be a property. Fixes [#545](https://github.com/OneSignal/OneSignal-Unity-SDK/issues/545)
+
 ## [3.0.5]
 ### Changed
 - Updated included Android SDK to [4.8.3](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/4.8.3)
@@ -165,7 +170,8 @@ If you run into any problems, please don’t hesitate to [open an issue](https:/
   - If you are updating from a previous version of the OneSignal Unity SDK please follow the Unity Asset Store instructions in
       the [README](https://github.com/OneSignal/OneSignal-Unity-SDK/README.md#unity-asset-store) to ensure a smooth transition.
 
-[Unreleased]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.5...HEAD
+[Unreleased]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.6...HEAD
+[3.0.6]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.5...3.0.6
 [3.0.5]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.4...3.0.5
 [3.0.4]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.3...3.0.4
 [3.0.3]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.2...3.0.3

OneSignalExample/Assets/OneSignal/VERSION

@@ -1 +1 @@
-3.0.5
+3.0.6

OneSignalExample/Packages/packages-lock.json

@@ -5,7 +5,7 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.onesignal.unity.core": "3.0.1"
+        "com.onesignal.unity.core": "3.0.6"
       }
     },
     "com.onesignal.unity.core": {
@@ -19,7 +19,7 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.onesignal.unity.core": "3.0.5"
+        "com.onesignal.unity.core": "3.0.6"
       }
     },
     "com.unity.ext.nunit": {

OneSignalExample/ProjectSettings/ProjectSettings.asset

@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 3.0.5
+  bundleVersion: 3.0.6
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0

com.onesignal.unity.android/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.onesignal.unity.android",
   "displayName": "OneSignal Unity SDK - Android",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "unity": "2018.4",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
-    "com.onesignal.unity.core": "3.0.5"
+    "com.onesignal.unity.core": "3.0.6"
   },
   "keywords": [
     "push-notifications",

com.onesignal.unity.core/Runtime/OneSignal.cs

@@ -34,7 +34,7 @@ namespace OneSignalSDK {
     /// OneSignal SDK for Unity
     /// </summary>
     public abstract partial class OneSignal {
-        public const string Version = "3.0.5";
+        public const string Version = "3.0.6";
 
         /// <summary>
         /// The default static instance of the OneSignal Unity SDK

com.onesignal.unity.core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.onesignal.unity.core",
   "displayName": "OneSignal Unity SDK - Core",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "unity": "2018.4",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {

com.onesignal.unity.ios/Editor/BuildPostProcessor.cs

@@ -42,6 +42,8 @@
  * 6. Observe Badge value is 1. (If it is 3 there is an App Group issue)
 */
 
+#if UNITY_IOS
+
 // Flag if an App Group should created for the main target and the NSE
 // Try renaming NOTIFICATION_SERVICE_EXTENSION_TARGET_NAME below first before
 //   removing ADD_APP_GROUP if you run into Provisioning errors in Xcode that
@@ -75,13 +77,13 @@ public class BuildPostProcessor : IPostprocessBuildWithReport {
         private static readonly string PluginLibrariesPath = Path.Combine(PackageName, "Runtime", "Plugins", "iOS");
         private static readonly string PluginFilesPath = Path.Combine("Packages", PluginLibrariesPath);
 
-        private readonly string _appGroupName = $"group.{PlayerSettings.applicationIdentifier}.onesignal";
-        
         private string _outputPath;
         private string _projectPath;
-        
+
         private readonly PBXProject _project = new PBXProject();
 
+        private string _appGroupName => $"group.{PlayerSettings.applicationIdentifier}.onesignal";
+
         /// <summary>
         /// must be between 40 and 50 to ensure that it's not overriden by Podfile generation (40) and that it's
         /// added before "pod install" (50)
@@ -279,4 +281,5 @@ private void ExtensionAddPodsToTarget() {
             File.WriteAllText(podfilePath, podfile);
         }
     }
-}
+}
+#endif

com.onesignal.unity.ios/Editor/PBXProjectExtensions.cs

@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 
+#if UNITY_IOS
 using UnityEditor.iOS.Xcode;
 
 namespace OneSignalSDK {
@@ -43,4 +44,5 @@ public static string GetMainTargetGuid(this PBXProject project)
              => project.TargetGuidByName(PBXProject.GetUnityTargetName());
     #endif
     }
-}
+}
+#endif

com.onesignal.unity.ios/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.onesignal.unity.ios",
   "displayName": "OneSignal Unity SDK - iOS",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "unity": "2018.4",
   "description": "OneSignal is the market leader in customer engagement, powering mobile push, web push, email, and in-app messages.",
   "dependencies": {
-    "com.onesignal.unity.core": "3.0.5"
+    "com.onesignal.unity.core": "3.0.6"
   },
   "keywords": [
     "push-notifications",