Merge pull request #702 from OneSignal/user-model/main-rebased

Rebase user-model/main into main

Author: jinliu9508

.github/workflows/set_response_time.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-      - run: npm install @octokit/[email protected]
+      - run: npm install @octokit
       - uses: actions/github-script@v6
         id: set-time 
         with:

MIGRATION.md renamed to MIGRATION_GUIDE_v2_to_v3.md

@@ -1,4 +1,57 @@
-# Version 1.2.169 - Jan 20, 2021
+# Version 1.2.177 - Aug 14, 2023
+* iOS Resolver - Added `/opt/homebrew/bin` to Cocoapod executable search path.
+  Fixes #627
+
+# Version 1.2.176 - Apr 27, 2023
+* Android Resolver - Added two Android Resolver settings to determine whether
+  EDM4U injects custom local Maven repo path as a relative path or full path.
+  Fixes #537
+* Android Resolver - Inject Maven Repo to `settingTemplate.gradle` from
+  Unity 2022.2+
+  Fixes #594
+* Android Resolver - Jetifier option is enabled by default now.
+* Android Resolver - `Explode Aar` option applies to all cases, whether the
+  project will be exported or not.
+  Fixes #584
+  Fixes #287
+
+# Version 1.2.175 - Nov 16, 2022
+* General - Added tvOS podfile support to the iOS resolver.
+
+# Version 1.2.174 - Oct 06, 2022
+* General - Added tvOS support to the iOS resolver.
+* General - Fixed #484 - Changed `EditorMeasurement` to use secure connection.
+* Android Resolver - Fixed Android Resolver unable to resolve
+  `mainTemplate.gradle` in Unity `2022.2+` or `2023.1+`.
+
+# Version 1.2.173 - Sep 28, 2022
+* General - Added tvOS library support to the export unity package scripts.
+
+# Version 1.2.172 - Jun 23, 2022
+* iOS Resolver - Stop forcing `ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES` to `YES`,
+  which seems to cause problem for some when submitting apps. See #526 for more
+  information.
+
+# Version 1.2.171 - May 11, 2022
+* iOS Resolver - Change `Enable Swift Framework Support Workaround` setting to
+  be `ON` by default since more pods are using Swift Framework now.
+
+# Version 1.2.170 - Apr 4, 2022
+* Android Resolver - Fixes #498 - Fix the path separator of the Maven repo
+  injected to `mainTemplate.gradle`.
+* iOS Resolver - Fixes #470 - Switch default Cocoapods master repo from Github
+  to CDN.
+* iOS Resolver - `Link Framework Statically` setting is now default to `true`.
+  That is, `use_frameworks! :linkage => static` will be added to `Podfile` by
+  default instead of `use_frameworks!`. This can be changed in iOS Resolver
+  settings. This fixes odd behaviors when pods include static libraries, ex.
+  Firebase Analytics.
+* iOS Resolver - Added a workaround when app crashes on launch due to
+  `Library not loaded: @rpath/libswiftCore.dylib` when some pods includes Swift
+  framework. This is turned `OFF` by default and can be changed in iOS Resolver
+  settings.
+
+# Version 1.2.169 - Jan 20, 2022
 * General - Fixes #425 - Change to save `GvhProjectSettings.xml` without
   Unicode byte order mark (BoM).
 * Android Resolver - Remove reference to `jcenter()`

MIGRATION_GUIDE_v3_to_v5.md

@@ -26,7 +26,7 @@ This causes the following problems:
      Unity project can be complex and a burden on a Unity plugin maintainer.
    * The process of resolving conflicting dependencies on platform specific
      libraries is pushed to the developer attempting to use a Unity plugin.
-     The developer trying to use you plugin is very likely to give up when
+     The developer trying to use your plugin is very likely to give up when
      faced with Android or iOS specific build errors.
    * The process of resolving conflicting Unity plugins (due to shared Unity
      plugin components) is pushed to the developer attempting to use your Unity
@@ -36,6 +36,9 @@ This causes the following problems:
 
 EDM provides solutions for each of these problems.
 
+If, after reading this, you need to debug usage of EDM in a Unity project,
+consult the debugging [step-by-step guide](troubleshooting-faq.md).
+
 ## Android Dependency Management
 
 The *Android Resolver* component of this plugin will download and integrate

OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll

@@ -0,0 +1,13 @@
+Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.mdb
+Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.mdb
+Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll
+Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.mdb
+Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll
+Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.mdb
+Assets/ExternalDependencyManager/Editor/CHANGELOG.md
+Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
+Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
+Assets/ExternalDependencyManager/Editor/LICENSE
+Assets/ExternalDependencyManager/Editor/README.md

OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.VersionHandlerImpl.dll

@@ -16,7 +16,7 @@
     "versionDefines": [
         {
             "name": "com.onesignal.unity.core",
-            "expression": "3.0.0-beta.1",
+            "expression": "5.1.0",
             "define": "ONE_SIGNAL_INSTALLED"
         }
     ],

OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169.meta renamed to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177.meta

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,10 +33,10 @@ namespace OneSignalSDK
     internal static class AttachToInit {
         #if ONE_SIGNAL_INSTALLED
             [RuntimeInitializeOnLoadMethod] public static void Init() {
-                if (string.IsNullOrEmpty(OneSignal.AppId))
-                    OneSignal.OnInitialize += appId => VSAttribution.SendAttributionEvent("Login", "OneSignal", appId);
+                if (string.IsNullOrEmpty(OneSignalPlatform.AppId))
+                    OneSignalPlatform.OnInitialize += appId => VSAttribution.SendAttributionEvent("Login", "OneSignal", appId);
                 else
-                    VSAttribution.SendAttributionEvent("Login", "OneSignal", OneSignal.AppId);
+                    VSAttribution.SendAttributionEvent("Login", "OneSignal", OneSignalPlatform.AppId);
             }
         #endif
     }

OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll

@@ -5,9 +5,99 @@ 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]
+## [5.1.0]
+### Fixed
+- iOS crash when calling OneSignal.User.PushSubscription.Id and OneSignal.User.PushSubscription.Token when they are null.
+### Changed
+- Add public getters for OneSignalId and ExternalId in the User namespace
+- Add public event handler OneSignal.User.Changed that fires when the OneSignalId or ExternalId changes
+- Updated included Android SDK to [5.1.5](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.1.5)
+
+## [5.0.6]
+### Fixed
+- Duplicate symbol errors when building with other iOS plugins
+- Removed READ_PHONE_STATE permission in Android builds. Delete your OneSignalConfig.androidlib and run the 
+"Copy Android plugin to Assets" step in **Window > OneSignal SDK Setup** to apply the fix.
+- Fixed lower build-tools versions being needed for Android builds. Delete your OneSignalConfig.androidlib and run the 
+"Copy Android plugin to Assets" step in **Window > OneSignal SDK Setup** to apply the fix.
+### Changed
+- Updated included Android SDK to [5.1.2](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.1.2).
+  - Android builds now require the Target API Level to be set to 33 or higher.
+- Updated included iOS SDK to [5.1.0](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.1.0)
+
+## [5.0.5]
+### Changed
+- Add public get tags method
+- Updated included Android SDK to [5.0.5](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.5)
+- Updated included iOS SDK to [5.0.5](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.5)
+### Fixed
+- Included meta files in OneSignalConfig.androidlib to prevent asset from being ignored
+- Package download url in the "Sync example code bundle package" step from the OneSignal SDK Setup
+
+## [5.0.4]
+### Changed
+- Updated included Android SDK to [5.0.3](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.3)
+
+## [5.0.3]
+### Changed
+- `InstallEdm4uStep` now imports version [1.2.177](https://github.com/googlesamples/unity-jar-resolver/releases/tag/v1.2.177) of [EDM4U](https://github.com/googlesamples/unity-jar-resolver)
+- Updated included Android SDK to [5.0.2](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.2)
+- Updated included iOS SDK to [5.0.2](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.2)
+- `OneSignalConfig.plugin` has been changed to `OneSignalConfig.androidlib`. Run the "Copy Android plugin to Assets" step in **Window > OneSignal SDK Setup** to migrate. Custom notification icons are now located in `Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res`
+### Fixed
+- Sending VSAttribution data from the editor
+- iOS notifications clicked event firing if the app was cold started from clicking a notification
+- ClassNotFoundException: com.onesignal.OneSignal for Android builds with minify enabled. You must run the "Copy Android plugin to Assets" step in **Window > OneSignal SDK Setup**.
+- Disabled bitcode to avoid iOS build error
+
+## [5.0.2]
+### Fixed
+- Stop foreground notifications from displaying after calling prevent default on iOS
+
+## [5.0.1]
+### Fixed
+- Push subscription Id and Token malloc error on iOS
+
+## [5.0.0]
+### Changed
+- Removed `SetLaunchURLsInApp`
+- Removed async from location request permission and updated method name to `RequestPermission`
+- Updated included iOS SDK to [5.0.1](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.1)
+- Updated included Android SDK to [5.0.0](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.0)
+- Updated default OneSignal Android notification icons to new logo
+### Fixed
+- NoSuchMethodError for outcome methods on Android
+- Completion check for the Copy Android plugin to Assets setup step
+
+## [5.0.0-beta.3]
+### Changed
+- Updated `Notifications`, `InAppMessages`, and `User` models to have Pascal Case properties
+- Updated public API. Please see the updated [migration guide](https://github.com/OneSignal/OneSignal-Unity-SDK/blob/5.0.0-beta.3/MIGRATION_GUIDE_v3_to_v5.md) for the most up to date signatures. 
+- Updated included Android SDK to [5.0.0-beta4](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.0-beta4)
+- Updated included iOS SDK to [5.0.0-beta-04](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.0-beta-04)
+
+## [5.0.0-beta.2]
+### Added
+- SDK type and version to api headers
+### Changed
+- Updated included Android SDK to [5.0.0-beta2](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.0-beta2)
+- Updated included iOS SDK to [5.0.0-beta-02](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.0-beta-02)
+
+## [5.0.0-beta.1]
+### Added
+- [Migration guide](https://github.com/OneSignal/OneSignal-Unity-SDK/blob/5.0.0-beta.1/MIGRATION_GUIDE_v3_to_v5.md
+) for updating from 3.x.x to 5.x.x
+### Changed
+- Overhauled public API of the SDK to a user-centered model. While this release is in beta please see our included [example MonoBehaviour](https://github.com/OneSignal/OneSignal-Unity-SDK/blob/5.0.0-beta.1/OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs) for usage.
+- Updated included Android SDK to [5.0.0-beta1](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.0-beta1)
+- Updated included iOS SDK to [5.0.0-beta-01](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.0-beta-01)
+
+If you run into any problems, please don’t hesitate to add to this [issue](https://github.com/OneSignal/OneSignal-Unity-SDK/issues/585)!
+
 ## [3.0.11]
 ### Fixed
 - Fixed rare Android ANRs on callbacks firing and also when backgrounding the app.
+
 ## [3.0.10]
 ### Changed
 - Updated included Android SDK to [4.8.5](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/4.8.5)
@@ -196,9 +286,18 @@ 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.11...HEAD
-[3.0.11]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.10...3.0.11
-[3.0.10]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.9...3.0.10
+[Unreleased]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.1.0...HEAD
+[5.1.0]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.6...5.1.0
+[5.0.6]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.5...5.0.6
+[5.0.5]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.4...5.0.5
+[5.0.4]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.3...5.0.4
+[5.0.3]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.2...5.0.3
+[5.0.2]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.1...5.0.2
+[5.0.1]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.0...5.0.1
+[5.0.0]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.0-beta.3...5.0.0
+[5.0.0-beta.3]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.0-beta.2...5.0.0-beta.3
+[5.0.0-beta.2]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/5.0.0-beta.1...5.0.0-beta.2
+[5.0.0-beta.1]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.9...5.0.0-beta.1
 [3.0.9]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.8...3.0.9
 [3.0.8]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.7...3.0.8
 [3.0.7]: https://github.com/OneSignal/OneSignal-Unity-SDK/compare/3.0.6...3.0.7

OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.169/Google.IOSResolver.dll.meta renamed to OneSignalExample/Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta

@@ -1,7 +1,7 @@
 /*
  * Modified MIT License
  *
- * Copyright 2022 OneSignal
+ * Copyright 2023 OneSignal
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal