Skip to content

Commit b9c675c

Browse files
authored
Merge pull request #583 from OneSignal/update-sdk-namespace
[User Model] Update SDK namespace
2 parents d785ad4 + 6b66d0c commit b9c675c

File tree

112 files changed

+15706
-3146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+15706
-3146
lines changed
File renamed without changes.

MIGRATION_GUIDE_v3_to_v5.md

Lines changed: 209 additions & 0 deletions
Large diffs are not rendered by default.

OneSignalExample/Assets/OneSignal/Attribution/OneSignal.UnityPackage.Attribution.asmdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"versionDefines": [
1717
{
1818
"name": "com.onesignal.unity.core",
19-
"expression": "3.0.0-beta.1",
19+
"expression": "3.0.0",
2020
"define": "ONE_SIGNAL_INSTALLED"
2121
}
2222
],

OneSignalExample/Assets/OneSignal/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Changed
9+
- Overhauled public API of the SDK to a user-centered model. While this release is in beta please see our included [example MonoBehaviour](Example/OneSignalExampleBehaviour.cs) for usage.
10+
- Updated included Android SDK to [5.0.0-beta1](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.0-beta1)
11+
- Updated included iOS SDK to [5.0.0-beta-01](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.0-beta-01)
12+
13+
If you run into any problems, please don’t hesitate to [open an issue](https://github.com/OneSignal/OneSignal-Unity-SDK/issues/new)!
14+
815
## [3.0.9]
916
### Fixed
1017
- Android - Lock OneSignal version so it doesn't get bumped to the next major version.

OneSignalExample/Assets/OneSignal/Editor/Setup/OneSignalSetupWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private void OnEnable() {
7575
if (Activator.CreateInstance(stepType) is OneSignalSetupStep step)
7676
steps.Add(step);
7777
else
78-
Debug.LogWarning($"could not create setup step from type {stepType.Name}");
78+
UnityEngine.Debug.LogWarning($"could not create setup step from type {stepType.Name}");
7979
}
8080

8181
_setupSteps = steps;

OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727

2828
#if ONE_SIGNAL_INSTALLED
2929
using System;
30-
using OneSignalSDKNew; // TODO: Change namespace and delete MiniJson copy, OneSignalExampleBehaviourOld, OneSignalExampleSceneOld
30+
using OneSignalSDK;
3131
using UnityEngine;
3232
using UnityEngine.UI;
33-
using OneSignalSDKNew.Debug.Utilities;
34-
using OneSignalSDKNew.Debug.Models;
35-
using OneSignalSDKNew.Notifications.Models;
36-
using OneSignalSDKNew.InAppMessages.Models;
37-
using OneSignalSDKNew.User.Models;
33+
using OneSignalSDK.Debug.Utilities;
34+
using OneSignalSDK.Debug.Models;
35+
using OneSignalSDK.Notifications.Models;
36+
using OneSignalSDK.InAppMessages.Models;
37+
using OneSignalSDK.User.Models;
3838
using System.Collections.Generic;
3939

4040
// ReSharper disable InconsistentNaming

OneSignalExample/Assets/Plugins/Android/mainTemplate.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply plugin: 'com.android.library'
2121
dependencies {
2222
implementation fileTree(dir: 'libs', include: ['*.jar'])
2323
// Android Resolver Dependencies Start
24-
implementation 'com.onesignal:OneSignal:4.8.3' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
24+
implementation 'com.onesignal:OneSignal:5.0.0-beta1' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6
2525
// Android Resolver Dependencies End
2626
**DEPS**}
2727

OneSignalExample/ProjectSettings/AndroidResolverDependencies.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dependencies>
22
<packages>
3-
<package>com.onesignal:OneSignal:4.8.3</package>
3+
<package>com.onesignal:OneSignal:5.0.0-beta1</package>
44
</packages>
55
<files />
66
<settings>

com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<repositories>
44
<repository>https://repo.maven.apache.org/maven2</repository>
55
</repositories>
6-
<androidPackage spec="com.onesignal:OneSignal:5.0.0-alpha1" />
6+
<androidPackage spec="com.onesignal:OneSignal:5.0.0-beta1" />
77
</androidPackages>
88
</dependencies>

com.onesignal.unity.android/Runtime/AndroidDebugManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
*/
2727

2828
using UnityEngine;
29-
using OneSignalSDKNew.Debug;
30-
using OneSignalSDKNew.Debug.Models;
29+
using OneSignalSDK.Debug;
30+
using OneSignalSDK.Debug.Models;
3131

32-
namespace OneSignalSDKNew.Android.Debug {
32+
namespace OneSignalSDK.Android.Debug {
3333
internal sealed class AndroidDebugManager : IDebugManager {
3434
private readonly AndroidJavaObject _debug;
3535

0 commit comments

Comments
 (0)