diff --git a/OneSignalExample/Assets/OneSignal/Platforms/Android/onesignal-unity.aar b/OneSignalExample/Assets/OneSignal/Platforms/Android/onesignal-unity.aar index b87ad3fc5..9486be0ae 100644 Binary files a/OneSignalExample/Assets/OneSignal/Platforms/Android/onesignal-unity.aar and b/OneSignalExample/Assets/OneSignal/Platforms/Android/onesignal-unity.aar differ diff --git a/OneSignalExample/Assets/OneSignal/Platforms/iOS/libOneSignal.a b/OneSignalExample/Assets/OneSignal/Platforms/iOS/libOneSignal.a index 99c3c04d1..cbfa92a7e 100644 Binary files a/OneSignalExample/Assets/OneSignal/Platforms/iOS/libOneSignal.a and b/OneSignalExample/Assets/OneSignal/Platforms/iOS/libOneSignal.a differ diff --git a/OneSignalExample/Assets/OneSignal/VERSION b/OneSignalExample/Assets/OneSignal/VERSION index 9183195ac..58073ef8d 100755 --- a/OneSignalExample/Assets/OneSignal/VERSION +++ b/OneSignalExample/Assets/OneSignal/VERSION @@ -1 +1 @@ -2.4.0 \ No newline at end of file +2.4.1 \ No newline at end of file diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor.meta b/OneSignalExample/Assets/PlayServicesResolver/Editor.meta index a43b5e387..9b622f7f4 100644 --- a/OneSignalExample/Assets/PlayServicesResolver/Editor.meta +++ b/OneSignalExample/Assets/PlayServicesResolver/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: df4c76149ebac4545b77cdd15456ad8b +guid: 23334212e59146c2862c2298ca49f4d5 folderAsset: yes timeCreated: 1448926516 licenseType: Pro diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.44.0.dll b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.44.0.dll deleted file mode 100644 index 6a436a1d7..000000000 Binary files a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.44.0.dll and /dev/null differ diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll new file mode 100644 index 000000000..27373ed89 Binary files /dev/null and b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll differ diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.44.0.dll.meta b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll.meta similarity index 87% rename from OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.44.0.dll.meta rename to OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll.meta index 5380988be..aeb30b3f7 100644 --- a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.44.0.dll.meta +++ b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: fce262af90fd47d8917081d85189fa81 +guid: 5672eb3eb9dc4a429e0b12ae7f5f3df6 labels: - gvh - gvh_targets-editor -- gvh_version-1.2.44.0 -timeCreated: 1503353845 +- gvh_version-1.2.54.0 +timeCreated: 1507343747 licenseType: Free PluginImporter: serializedVersion: 2 diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.44.0.dll b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll similarity index 98% rename from OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.44.0.dll rename to OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll index f67ad6f6a..6681b05f3 100644 Binary files a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.44.0.dll and b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll differ diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.44.0.dll.meta b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll.meta similarity index 87% rename from OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.44.0.dll.meta rename to OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll.meta index 7b2d5e651..ed9ed0615 100644 --- a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.44.0.dll.meta +++ b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 2a0daa2f8bb24bdc8ff75fa3c8141aa4 +guid: 2590bd31de3a41c0a9f49c8b11641ec6 labels: - gvh - gvh_targets-editor -- gvh_version-1.2.44.0 -timeCreated: 1503353836 +- gvh_version-1.2.54.0 +timeCreated: 1507343750 licenseType: Free PluginImporter: serializedVersion: 2 diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll index 5f38d1383..6234aeaf0 100644 Binary files a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll and b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll differ diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta index 233e4f1fc..73d54ebb6 100644 --- a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta +++ b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 6d9c1f2d76894ba08ef7d00bcf732508 +guid: a7eb148184054971a5a5d80705d21553 labels: - gvh - gvh_targets-editor -- gvh_version-1.2.44.0 +- gvh_version-1.2.54.0 timeCreated: 1473798236 licenseType: Pro PluginImporter: diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.44.0.dll b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.44.0.dll deleted file mode 100644 index e4b1e9af7..000000000 Binary files a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.44.0.dll and /dev/null differ diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll new file mode 100644 index 000000000..44794847a Binary files /dev/null and b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll differ diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.44.0.dll.meta b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll.meta similarity index 87% rename from OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.44.0.dll.meta rename to OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll.meta index 79c066bca..c84d8682f 100644 --- a/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.44.0.dll.meta +++ b/OneSignalExample/Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: 162e907c738e4d1b90cbefa07a6e7c69 +guid: f79fc079e06f42fbaf712581e573a104 labels: - gvh - gvh_targets-editor -- gvh_version-1.2.44.0 -timeCreated: 1503353842 +- gvh_version-1.2.54.0 +timeCreated: 1507343742 licenseType: Free PluginImporter: serializedVersion: 2 diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.44.0.txt b/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.44.0.txt deleted file mode 100644 index cf6b65fcf..000000000 --- a/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.44.0.txt +++ /dev/null @@ -1,4 +0,0 @@ -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.44.0.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.44.0.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.44.0.dll diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt b/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt new file mode 100644 index 000000000..6476a85f2 --- /dev/null +++ b/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt @@ -0,0 +1,4 @@ +Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll +Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll +Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll +Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll diff --git a/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.44.0.txt.meta b/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt.meta similarity index 72% rename from OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.44.0.txt.meta rename to OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt.meta index 7aa5974e5..bb9b7c497 100644 --- a/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.44.0.txt.meta +++ b/OneSignalExample/Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: c34a7787288e47a1867527c7d1148a03 +guid: de05f212ebe54d579a22cb4ad421d36d labels: - gvh - gvh_manifest -- gvh_version-1.2.44.0 +- gvh_version-1.2.54.0 timeCreated: 1474401009 licenseType: Pro TextScriptImporter: diff --git a/OneSignalExample/Assets/PlayServicesResolver/proguard-messaging-workaround.txt b/OneSignalExample/Assets/PlayServicesResolver/proguard-messaging-workaround.txt deleted file mode 100644 index 184fbfdca..000000000 --- a/OneSignalExample/Assets/PlayServicesResolver/proguard-messaging-workaround.txt +++ /dev/null @@ -1,2 +0,0 @@ -# The dependency on Analytics is a soft dependency. --dontwarn com.google.android.gms.measurement.AppMeasurement* \ No newline at end of file diff --git a/OneSignalExample/Assets/PlayServicesResolver/proguard-messaging-workaround.txt.meta b/OneSignalExample/Assets/PlayServicesResolver/proguard-messaging-workaround.txt.meta deleted file mode 100644 index 0e5f4c942..000000000 --- a/OneSignalExample/Assets/PlayServicesResolver/proguard-messaging-workaround.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7d0171f972e18447e8487c88efbfdeae -timeCreated: 1502496314 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/OneSignalExample/Assets/PlayServicesResolver/proguard-unity.txt b/OneSignalExample/Assets/PlayServicesResolver/proguard-unity.txt deleted file mode 100644 index b861baf20..000000000 --- a/OneSignalExample/Assets/PlayServicesResolver/proguard-unity.txt +++ /dev/null @@ -1,4 +0,0 @@ --keep class bitter.jnibridge.* { *; } --keep class com.unity3d.* { *; } --keep class org.fmod.* { *; } --dontobfuscate diff --git a/OneSignalExample/Assets/PlayServicesResolver/proguard-unity.txt.meta b/OneSignalExample/Assets/PlayServicesResolver/proguard-unity.txt.meta deleted file mode 100644 index d32a42881..000000000 --- a/OneSignalExample/Assets/PlayServicesResolver/proguard-unity.txt.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e3813de19a63846339b82cd934dc99c3 -timeCreated: 1502496314 -licenseType: Pro -TextScriptImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/OneSignalExample/ProjectSettings/ProjectVersion.txt b/OneSignalExample/ProjectSettings/ProjectVersion.txt index 735bd8a67..a211ccd3c 100644 --- a/OneSignalExample/ProjectSettings/ProjectVersion.txt +++ b/OneSignalExample/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.6.2f1 +m_EditorVersion: 2017.1.1f1 diff --git a/OneSignalSDK.unitypackage b/OneSignalSDK.unitypackage index 5b33134fe..692c85a6f 100644 Binary files a/OneSignalSDK.unitypackage and b/OneSignalSDK.unitypackage differ