Skip to content

Commit ba315f9

Browse files
committed
Update to latest 3.4.0 Android native SDK and Unity 5.4 fixes
* Updated to latest 3.4.0 Android native SDK. - Google Project number use from OneSignal server settings instead of local. - Supports background image alignment. - Send priority effects display priority * Unity 5.4 bug fixes - iOS - Android files were being included in the Xcode project. - Set meta import settings to include Android only on Android/OneSignalConfig folder. * Android - Updated to v1.2.2 of unity-jar-resolver to fix menu not showing.
1 parent d4d006c commit ba315f9

File tree

55 files changed

+201
-1787
lines changed

Some content is hidden

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

55 files changed

+201
-1787
lines changed

LICENSE

+1-16
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,7 @@ Includes portions from the Google GcmClient demo project:
3838
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
3939
See the License for the specific language governing permissions and
4040
limitations under the License.
41-
42-
Includes Portions Copyright 2014 StackMob:
43-
Copyright 2014 StackMob
44-
45-
Licensed under the Apache License, Version 2.0 (the "License");
46-
you may not use this file except in compliance with the License.
47-
You may obtain a copy of the License at
48-
49-
http://www.apache.org/licenses/LICENSE-2.0
50-
51-
Unless required by applicable law or agreed to in writing, software
52-
distributed under the License is distributed on an "AS IS" BASIS,
53-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
54-
See the License for the specific language governing permissions and
55-
limitations under the License.
56-
41+
5742
Includes portions from RootTools:
5843
Copyright (c) 2012 Stephen Erickson, Chris Ravenscroft, Dominik Schuermann, Adam Shanks
5944

Unity4.7OneSignalExample/Assets/OneSignal/Example/GameControllerExample.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ void Start () {
4343
// The only required method you need to call to setup OneSignal to receive push notifications.
4444
// Call before using any other methods on OneSignal.
4545
// Should only be called once when your app is loaded.
46-
// OneSignal.Init(OneSignal_AppId, GoogleProjectNumber);
47-
//b2f7f966-d8cc-11e4-bed1-df8f05be55ba
48-
OneSignal.StartInit("4ba9ec31-b65a-4f5f-b210-a5077a245b3d", "703322744261")
46+
// OneSignal.Init(OneSignal_AppId);
47+
OneSignal.StartInit("b2f7f966-d8cc-11e4-bed1-df8f05be55ba")
4948
.HandleNotificationReceived(HandleNotificationReceived)
5049
.HandleNotificationOpened(HandleNotificationOpened)
5150
.InFocusDisplaying(OneSignal.OSInFocusDisplayOption.Notification)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.1
1+
2.1.0

Unity4.7OneSignalExample/Assets/PlayServicesResolver/Editor/DefaultResolver.cs

-298
This file was deleted.

Unity4.7OneSignalExample/Assets/PlayServicesResolver/Editor/DefaultResolver.cs.meta

-12
This file was deleted.

Unity4.7OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.2.0.dll.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Unity4.7OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.2.0.dll.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Unity4.7OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler_v1.2.2.0.dll.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)