Merge pull request #41 from urbanairship/MB-1823

[MB-1823]: Release 2.3.0

Assets/PlayServicesResolver/Editor/PlayServicesResolver.cs

@@ -33,13 +33,6 @@ namespace GooglePlayServices
     [InitializeOnLoad]
     public class PlayServicesResolver : AssetPostprocessor
     {
-        /// <summary>
-        /// The name of the current resolver.
-        /// </summary>
-        /// <remarks>
-        /// This should be updated when a new revision is created.
-        /// </remarks>
-        private static string CurrentResolverName = "ResolverVer1_1";
         /// <summary>
         /// The instance to the play services support object.
         /// </summary>
@@ -79,22 +72,18 @@ public static IResolver RegisterResolver(IResolver resolverImpl)
             {
                 _resolver = resolverImpl;
             }
+            Debug.Log("Resolver version is now: " + _resolver.Version());
             return _resolver;
         }
 
         /// <summary>
         /// Gets the resolver.
         /// </summary>
         /// <value>The resolver.</value>
-        static IResolver Resolver
+        public static IResolver Resolver
         {
             get
             {
-                if (_resolver == null)
-                {
-                    // create the latest resolver known.
-                    _resolver = Activator.CreateInstance("GooglePlayServices", CurrentResolverName) as IResolver;
-                }
                 return _resolver;
             }
         }
@@ -154,7 +143,7 @@ public static void MenuResolve()
         /// <returns><c>true</c>, if overwrite confirmation was handled, <c>false</c> otherwise.</returns>
         /// <param name="oldDep">Old dependency.</param>
         /// <param name="newDep">New dependency replacing old.</param>
-        static bool HandleOverwriteConfirmation(Dependency oldDep, Dependency newDep)
+        public static bool HandleOverwriteConfirmation(Dependency oldDep, Dependency newDep)
         {
             // Don't prompt overwriting the same version, just do it.
             if (oldDep.BestVersion != newDep.BestVersion)

Assets/PlayServicesResolver/Editor/ResolverVer1_1.cs

@@ -113,7 +113,7 @@ void ProcessAars(string dir)
         /// </summary>
         /// <returns><c>true</c>, if explode was shoulded, <c>false</c> otherwise.</returns>
         /// <param name="aarFile">The aar file.</param>
-        bool ShouldExplode(string aarFile)
+        internal virtual bool ShouldExplode(string aarFile)
         {
             return aarFile.Contains("play-services-measurement") ||
             !SupportsAarFiles;

Assets/PlayServicesResolver/Editor/ResolverVer1_2.cs

@@ -0,0 +1,64 @@
+// <copyright file="ResolverVer1_1.cs" company="Google Inc.">
+// Copyright (C) 2015 Google Inc. All Rights Reserved.
+//
+//  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.
+// </copyright>
+#if UNITY_ANDROID
+
+namespace GooglePlayServices
+{
+    using UnityEngine;
+    using UnityEditor;
+
+    [InitializeOnLoad]
+    public class ResolverVer1_2 : ResolverVer1_1
+    {
+
+        private const int MajorVersion = 1;
+        private const int MinorVersion = 2;
+        private const int PointVersion = 0;
+
+        static ResolverVer1_2()
+        {
+            PlayServicesResolver.RegisterResolver(new ResolverVer1_2());
+            Debug.Log("Registering resolver version " + MajorVersion + "." +
+                MinorVersion + "." + PointVersion);
+            PlayServicesResolver.RegisterResolver(new ResolverVer1_2());
+
+        }
+        /// <summary>
+        /// Version of the resolver.
+        /// </summary>
+        /// <remarks>The resolver with the greatest version is used when resolving.
+        /// The value of the verison is calcuated using MakeVersion in DefaultResolver</remarks>
+        /// <seealso cref="DefaultResolver.MakeVersionNumber"></seealso>
+        public override int Version()
+        {
+            return MakeVersionNumber(MajorVersion, MinorVersion, PointVersion);
+        }
+
+        /// <summary>
+        /// Shoulds the explode the aar file.
+        /// </summary>
+        /// <returns><c>true</c>, if explode was shoulded, <c>false</c> otherwise.</returns>
+        /// <param name="aarFile">The aar file.</param>
+        internal override bool ShouldExplode(string aarFile)
+        {
+            return base.ShouldExplode(aarFile) ||
+            aarFile.Contains("firebase-common") ||
+            aarFile.Contains("firebase-measurement") ||
+            !SupportsAarFiles;
+        }
+    }
+}
+#endif

Assets/PlayServicesResolver/Editor/SampleDependencies.cs

@@ -32,6 +32,7 @@ public static class SampleDependencies
 
 /*
     private static readonly string PluginName = "your_plugin_name";
+    public static PlayServicesSupport svcSupport;
 
     /// <summary>
     /// Initializes static members of the <see cref="SampleDependencies"/> class.
@@ -43,7 +44,11 @@ static SampleDependencies()
                                              PluginName,
                                              EditorPrefs.GetString("AndroidSdkRoot"),
                                              "ProjectSettings");
+        RegisterDependencies();
+    }
 
+    public static void RegisterDependencies()
+    {
         // add your dependencies here
 
         // svcSupport.DependOn("com.google.android.gms", "play-services-base", "8.1+");

Assets/UrbanAirship/Editor/UADependencies.cs

@@ -30,8 +30,8 @@ static UADependencies()
 				EditorPrefs.GetString ("AndroidSdkRoot"),
 				"ProjectSettings");
 
-			svcSupport.DependOn ("com.google.android.gms", "play-services-gcm", "8.4+");
-			svcSupport.DependOn ("com.android.support", "support-v4", "23.1+");
+			svcSupport.DependOn ("com.google.android.gms", "play-services-gcm", "9.0.2");
+			svcSupport.DependOn ("com.android.support", "support-v4", "23.4.0");
 
 
 			// Resolve dependency on load. Only resolve the dependency if we are using the ResolverVer1_1

CHANGELOG

@@ -1,6 +1,13 @@
 UA Unity ChangeLog
 ==================
 
+Version 2.3.0 - June 24, 2016
+=============================
+ - Updated Urban Airship Android library to 7.2.0
+ - Updated the JarResolver dependency to 1.2.0
+ - Removed the Android Application override. Existing installations may need to
+   remove the UrbanAirshipApplication entry from Assets/Plugins/Android/AndroidManifest.xml.
+
 Version 2.2.0 - June 2, 2016
 ============================
  - Updated Urban Airship iOS Library to 7.2.0

airship.properties

@@ -1 +1 @@
-version = 2.2.0
+version = 2.3.0

android-plugin-lib/build.gradle

@@ -31,7 +31,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 10
@@ -42,8 +42,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile 'com.urbanairship:urbanairship-sdk:+@aar'
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:support-annotations:23.1.1'
+    compile 'com.android.support:support-v4:23.4.0'
+    compile 'com.android.support:support-annotations:23.4.0'
 }
 
 task copyUnityClassesJar() {

build.gradle

@@ -86,7 +86,6 @@ task build << {
                     "Assets/UrbanAirship",
                     "Assets/PlayServicesResolver",
                     "Assets/Plugins/iOS",
-                    "Assets/Plugins/Android/AndroidManifest.xml",
                     "Assets/Plugins/Android/urbanairship-sdk",
                     "Assets/Plugins/Android/urbanairship-plugin-lib",
                     "Assets/Scripts",