Updated native iOS to 2.5.2 and Android to 3.4.4

- Also updated to Google's unity jar resolver to 1.2.16.0
- Note, new iOS 2.5.0 method's haven't been added to C# interfaces
   - Will be part of a future update when Android has matching methods.

Author: jkasten2

Unity4.7OneSignalExample/Assets/OneSignal/Editor/OneSignalEditorScript.cs

@@ -25,31 +25,64 @@
  * THE SOFTWARE.
  */
 
+using System;
 using System.IO;
+
 using UnityEditor;
 
 #if UNITY_ANDROID && UNITY_EDITOR
-using Google.JarResolver;
+using System.Collections.Generic;
 
 [InitializeOnLoad]
-public class OneSignalEditorScriptAndroid {
-  
+public class OneSignalEditorScriptAndroid : AssetPostprocessor {
+
+   /// <summary>Instance of the PlayServicesSupport resolver</summary>
+   public static object svcSupport;
+
    private static readonly string PluginName = "OneSignal";
-   private static readonly string PLAY_SERVICES_VERSION = "9+";
-   public static PlayServicesSupport svcSupport;
+   private static readonly string PLAY_SERVICES_VERSION = "+";
 
    static OneSignalEditorScriptAndroid() {
       createOneSignalAndroidManifest();
       addGMSLibrary();
    }
 
    private static void addGMSLibrary() {
-      svcSupport = PlayServicesSupport.CreateInstance(PluginName,
-                                                      EditorPrefs.GetString("AndroidSdkRoot"),
-                                                      "ProjectSettings");
-      
-      svcSupport.DependOn("com.google.android.gms", "play-services-gcm", PLAY_SERVICES_VERSION);
-      svcSupport.DependOn("com.google.android.gms", "play-services-location", PLAY_SERVICES_VERSION);
+      Type playServicesSupport = Google.VersionHandler.FindClass(
+         "Google.JarResolver", "Google.JarResolver.PlayServicesSupport");
+      if (playServicesSupport == null)
+         return;
+
+      svcSupport = svcSupport ?? Google.VersionHandler.InvokeStaticMethod(
+        playServicesSupport, "CreateInstance",
+        new object[] {
+                PluginName,
+                EditorPrefs.GetString("AndroidSdkRoot"),
+                "ProjectSettings"
+        });
+
+      Google.VersionHandler.InvokeInstanceMethod(
+         svcSupport, "DependOn",
+         new object[] {
+            "com.google.android.gms",
+            "play-services-gcm",
+            PLAY_SERVICES_VERSION
+         },
+         namedArgs: new Dictionary<string, object>() {
+             {"packageIds", new string[] { "extra-google-m2repository" } }
+         });
+
+      Google.VersionHandler.InvokeInstanceMethod(
+         svcSupport, "DependOn",
+         new object[] {
+            "com.google.android.gms",
+            "play-services-location",
+            PLAY_SERVICES_VERSION
+         },
+         namedArgs: new Dictionary<string, object>() {
+             {"packageIds", new string[] { "extra-google-m2repository" } }
+         });
+
       // Adds play-services-base, play-services-basement, play-services-iid, and support-v4 will be automaticly added.
       // Also adds play-services-tasks but this isn't used by OneSignal, it just added as a depency from the above.
 
@@ -75,7 +108,11 @@ private static void createOneSignalAndroidManifest() {
       string body = streamReader.ReadToEnd();
       streamReader.Close();
 
-      body = body.Replace("${manifestApplicationId}", PlayerSettings.bundleIdentifier);
+      #if UNITY_4_7
+         body = body.Replace("${manifestApplicationId}", PlayerSettings.bundleIdentifier);
+      #else
+         body = body.Replace("${manifestApplicationId}", PlayerSettings.applicationIdentifier);
+      #endif
       using (var streamWriter = new StreamWriter(manifestFullPath, false))
       {
          streamWriter.Write(body);

Unity4.7OneSignalExample/Assets/OneSignal/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1