Replaced .aar and jars with PlayServicesResolver

* The Google Play services library dependencies will now be added by the PlayServicesResolver.
   - It will automatically include the correct .aar files (projects for Unity4.7) and prevent conflict issues with other plugins.
   - Tested compatibility with play-games-plugin-for-unity.

Author: jkasten2

LICENSE

@@ -1,6 +1,6 @@
 Modified MIT License
 
-Copyright 2015 OneSignal
+Copyright 2016 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
@@ -125,4 +125,20 @@ Includes ShortcutBadger:
         distributed under the License is distributed on an "AS IS" BASIS,
         WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
         See the License for the specific language governing permissions and
-        limitations under the License.
+        limitations under the License.
+        
+    
+Includes unity-jar-resolver
+    Copyright (C) 2014 Google Inc.
+ 
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+ 
+        http://www.apache.org/licenses/LICENSE-2.0
+ 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.

Unity4.7OneSignalExample/.gitignore

@@ -53,3 +53,11 @@ Assets/Root
 
 /iosbuild/
 /web/
+
+/Assets/Plugins/Android/play-services-*
+/Assets/Plugins/Android/support-v4-*
+/Assets/Plugins/Android/support-annotations-*.jar*
+
+/ProjectSettings/GoogleDependencyOneSignal.xml
+
+/Assets/Plugins/Android/OneSignalConfig/AndroidManifest.xml*

Unity4.7OneSignalExample/Assets/Plugins/OneSignal.meta renamed to Unity4.7OneSignalExample/Assets/OneSignal.meta

@@ -0,0 +1,86 @@
+/**
+ * Modified MIT License
+ * 
+ * Copyright 2016 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * 1. The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * 2. All copies of substantial portions of the Software may only be used in connection
+ * with services provided by OneSignal.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#if UNITY_ANDROID && UNITY_EDITOR
+using UnityEditor;
+using System.IO;
+using UnityEngine;
+
+using Google.JarResolver;
+
+[InitializeOnLoad]
+public class OneSignalEditorScript {
+  
+   private static readonly string PluginName = "OneSignal";
+   private static readonly string PLAY_SERVICES_VERSION = "9+";
+   public static PlayServicesSupport svcSupport;
+
+   static OneSignalEditorScript () {
+      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);
+      // 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.
+      
+      
+      // Setting 8.3+ does not work with unity-jar-resolver-1.2.0 and GooglePlayGamesPlugin-0.9.34.
+      //   It creates conflicting aar files with mismatched version of 8.4 and 9.4
+      // svcSupport.DependOn("com.google.android.gms", "play-services-gcm", "8.3+");
+      // svcSupport.DependOn("com.google.android.gms", "play-services-location", "8.3+");
+      // play-services-base, play-services-basement, and support-v4 will be automaticly added.
+      // play-services-maps and play-services-measurement are not used by OneSignal
+      //    but are included as depencies from the other parts of play-services.
+   }
+   
+   // Copies `AndroidManifestTemplate.xml` to `AndroidManifest.xml`
+   //   then replace `${manifestApplicationId}` with current packagename in the Unity settings. 
+   private static void createOneSignalAndroidManifest() {
+      string oneSignalConfigPath = "Assets/Plugins/Android/OneSignalConfig/";
+      string manifestFullPath = oneSignalConfigPath + "AndroidManifest.xml";
+
+      File.Copy(oneSignalConfigPath + "AndroidManifestTemplate.xml", manifestFullPath, true);
+
+      StreamReader streamReader = new StreamReader(manifestFullPath);
+      string body = streamReader.ReadToEnd();
+      streamReader.Close();
+
+      body = body.Replace("${manifestApplicationId}", PlayerSettings.bundleIdentifier);
+      using (var streamWriter = new StreamWriter(manifestFullPath, false))
+      {
+         streamWriter.Write(body);
+      }
+   }
+}
+#endif

Unity4.7OneSignalExample/Assets/Plugins/OneSignal/Editor.meta renamed to Unity4.7OneSignalExample/Assets/OneSignal/Editor.meta

@@ -0,0 +1 @@
+1.16.0