More updates for 0.9.34

- Updated package name to 0.9.34 - Fixed * playgameservices#1179 - Interfaces should not be under `#if` * playgameservices#1175 - Play-services version needs to be updated to 9.0.0 * playgameservices#1180 - PlayGamesUserProfile.Equals(object obj)` implemented incorrectly Change-Id: Icb8f051c3bcced402989965bf86db5d7f336b3bb
ktpttd · May 26, 2016 · eb4d8f1 · eb4d8f1
2 parents c025cad + 29040f2
commit eb4d8f1
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 42 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,6 +1,9 @@
 Version 0.9.34
     Bug Fixes:
         * #1162 - Cannot build from source
+        * #1179 - Interfaces should not be under `#if`
+        * #1175 - Play-services version needs to be updated to 9.0.0
+        * #1180 - PlayGamesUserProfile.Equals(object obj)` implemented incorrectly
     New Features:
         * #1085 - Add SpendProbability player stat.
 Version 0.9.33

diff --git a/current-build/GooglePlayGamesPlugin-0.9.33.unitypackage b/current-build/GooglePlayGamesPlugin-0.9.33.unitypackage
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/CommonTypes.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/CommonTypes.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi
 {
@@ -115,4 +114,3 @@ public enum LeaderboardCollection
         Social = 2,
       }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Events/IEvent.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Events/IEvent.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Events
 {
@@ -79,4 +78,3 @@ EventVisibility Visibility
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Multiplayer/IRealTimeMultiplayerClient.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Multiplayer/IRealTimeMultiplayerClient.cs
@@ -13,10 +13,11 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Multiplayer
 {
+// move inside the namespace so the namespace is declared if not using GPGS
+#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
   using System;
   using System.Collections.Generic;
   using GooglePlayGames.BasicApi.Multiplayer;
@@ -217,5 +218,5 @@ void CreateWithInvitationScreen(uint minOpponents, uint maxOppponents, uint vari
     /// <param name="invitationId">Invitation id to decline.</param>
     void DeclineInvitation(string invitationId);
   }
-}
-#endif
+    #endif
+}
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Multiplayer/Player.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Multiplayer/Player.cs
@@ -17,12 +17,11 @@
 
 namespace GooglePlayGames.BasicApi.Multiplayer
 {
-    using UnityEngine;
 
     /// <summary>
     /// Represents a player. A player is different from a participant! The participant is
     /// an entity that takes part in a particular match; a Player is a real-world person
-    /// (tied to a Google account). The player exists across matches, the Participant
+    /// (tied to a Games account). The player exists across matches, the Participant
     /// only exists in the context of a particular match.
     /// </summary>
     public class Player : PlayGamesUserProfile

diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/AdvertisingResult.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/AdvertisingResult.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Nearby
 {
@@ -57,4 +56,3 @@ public string LocalEndpointName
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/ConnectionRequest.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/ConnectionRequest.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Nearby
 {
@@ -50,4 +49,3 @@ public byte[] Payload
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/ConnectionResponse.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/ConnectionResponse.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Nearby
 {
@@ -119,4 +118,3 @@ public static ConnectionResponse AlreadyConnected(long localClientId,
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/EndpointDetails.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/EndpointDetails.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Nearby
 {
@@ -67,4 +66,3 @@ public string ServiceId
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/INearbyConnectionClient.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/INearbyConnectionClient.cs
@@ -13,12 +13,15 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
+
 namespace GooglePlayGames.BasicApi.Nearby
 {
     using System;
     using System.Collections.Generic;
 
+    // move this inside IMessageListener and IDiscoveryListener are always declared.
+    #if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
+
     public interface INearbyConnectionClient
     {
 
@@ -61,6 +64,7 @@ void StartDiscovery(string serviceId, TimeSpan? advertisingTimeout,
 
         string GetServiceId();
     }
+#endif
 
     public interface IMessageListener
     {
@@ -77,4 +81,4 @@ public interface IDiscoveryListener
         void OnEndpointLost(string lostEndpointId);
     }
 }
-#endif
+
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/NearbyConnectionConfiguration.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Nearby/NearbyConnectionConfiguration.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Nearby
 {
@@ -59,4 +58,3 @@ public Action<InitializationStatus> InitializationCallback
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Quests/IQuest.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Quests/IQuest.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Quests
 {
@@ -123,4 +122,3 @@ QuestState State
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Quests/IQuestMilestone.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Quests/IQuestMilestone.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Quests
 {
@@ -94,4 +93,3 @@ MilestoneState State
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/Quests/IQuestsClient.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/Quests/IQuestsClient.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.Quests
 {
@@ -160,4 +159,3 @@ void ClaimMilestone(IQuestMilestone milestone,
                             Action<QuestClaimMilestoneStatus, IQuest, IQuestMilestone> callback);
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/SavedGame/ISavedGameClient.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/SavedGame/ISavedGameClient.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.SavedGame
 {
@@ -345,5 +344,4 @@ public interface IConflictResolver
         void ChooseMetadata(ISavedGameMetadata chosenMetadata);
     }
 }
-#endif
 
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/SavedGame/ISavedGameMetadata.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/SavedGame/ISavedGameMetadata.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.SavedGame
 {
@@ -94,4 +93,3 @@ DateTime LastModifiedTimestamp
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/BasicApi/SavedGame/SavedGameMetadataUpdate.cs b/source/PluginDev/Assets/GooglePlayGames/BasicApi/SavedGame/SavedGameMetadataUpdate.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.BasicApi.SavedGame
 {
@@ -132,4 +131,3 @@ public SavedGameMetadataUpdate Build()
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/Editor/GPGSAndroidSetupUI.cs b/source/PluginDev/Assets/GooglePlayGames/Editor/GPGSAndroidSetupUI.cs
@@ -108,6 +108,8 @@ public static bool PerformSetup(
                 // check the bundle id and set it if needed.
                 CheckBundleId();
 
+                GPGSDependencies.svcSupport.ClearDependencies();
+                GPGSDependencies.RegisterDependencies();
                 PlayServicesResolver.Resolver.DoResolution(
                     GPGSDependencies.svcSupport,
                     "Assets/Plugins/Android",

diff --git a/source/PluginDev/Assets/GooglePlayGames/Editor/GPGSDependencies.cs b/source/PluginDev/Assets/GooglePlayGames/Editor/GPGSDependencies.cs
@@ -46,6 +46,14 @@ static GPGSDependencies()
                                              EditorPrefs.GetString("AndroidSdkRoot"),
                                              "ProjectSettings");
 
+            RegisterDependencies();
+        }
+
+        /// <summary>
+        /// Registers the dependencies.
+        /// </summary>
+        public static void RegisterDependencies()
+        {
             svcSupport.DependOn("com.google.android.gms",
                 "play-services-games",
                 PluginVersion.PlayServicesVersionConstraint);

diff --git a/source/PluginDev/Assets/GooglePlayGames/ISocialPlatform/PlayGamesPlatform.cs b/source/PluginDev/Assets/GooglePlayGames/ISocialPlatform/PlayGamesPlatform.cs
@@ -829,7 +829,11 @@ public void LoadAchievementDescriptions(Action<IAchievementDescription[]> callba
             {
                 GooglePlayGames.OurUtils.Logger.e(
                     "LoadAchievementDescriptions can only be called after authentication.");
-                callback.Invoke(null);
+                if (callback != null)
+                {
+                    callback.Invoke(null);
+                }
+                return;
             }
 
             mClient.LoadAchievements(ach =>

diff --git a/source/PluginDev/Assets/GooglePlayGames/ISocialPlatform/PlayGamesUserProfile.cs b/source/PluginDev/Assets/GooglePlayGames/ISocialPlatform/PlayGamesUserProfile.cs
@@ -13,10 +13,12 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
+
 #if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames
 {
+    using System;
     using System.Collections;
     using GooglePlayGames.OurUtils;
     using UnityEngine;
@@ -163,12 +165,13 @@ public override bool Equals(object obj)
                 return true;
             }
 
-            if (!typeof(object).IsSubclassOf(typeof(PlayGamesUserProfile)))
+            PlayGamesUserProfile other = obj as PlayGamesUserProfile;
+            if (other == null)
             {
                 return false;
             }
 
-            return mPlayerId.Equals(((PlayGamesUserProfile)obj).mPlayerId);
+            return StringComparer.Ordinal.Equals(mPlayerId, other.mPlayerId);
         }
 
         public override int GetHashCode()

diff --git a/source/PluginDev/Assets/GooglePlayGames/OurUtils/Logger.cs b/source/PluginDev/Assets/GooglePlayGames/OurUtils/Logger.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.OurUtils
 {
@@ -88,4 +87,4 @@ private static string ToLogMessage(string prefix, string logType, string msg)
         }
     }
 }
-#endif
+
diff --git a/source/PluginDev/Assets/GooglePlayGames/OurUtils/Misc.cs b/source/PluginDev/Assets/GooglePlayGames/OurUtils/Misc.cs
@@ -13,7 +13,6 @@
 //  See the License for the specific language governing permissions and
 //    limitations under the License.
 // </copyright>
-#if (UNITY_ANDROID || (UNITY_IPHONE && !NO_GPGS))
 
 namespace GooglePlayGames.OurUtils
 {
@@ -99,4 +98,3 @@ public static T CheckNotNull<T>(T value, string paramName)
         }
     }
 }
-#endif
diff --git a/source/PluginDev/Assets/GooglePlayGames/PluginVersion.cs b/source/PluginDev/Assets/GooglePlayGames/PluginVersion.cs
@@ -38,7 +38,7 @@ public class PluginVersion
     public const int MinGmsCoreVersionCode = 8487000;
 
     // used to get the right version of dependencies.
-    public const string PlayServicesVersionConstraint = "8.4+";
+    public const string PlayServicesVersionConstraint = "9+";
   }
 }
 #endif
diff --git a/source/build.gradle b/source/build.gradle
@@ -44,7 +44,7 @@ project.ext {
     samplesBuildSrc = file('build/sampleSrc').absolutePath
     exportPath = file('build/plugin.unitypackage').absolutePath
     currentPluginPath = file('../current-build').absolutePath
-    currentPluginName = 'GooglePlayGamesPlugin-0.9.33.unitypackage'
+    currentPluginName = 'GooglePlayGamesPlugin-0.9.34.unitypackage'
     resolverDir = new File('build/jarresolver').absolutePath
 
     sampleList = ['CubicPilot', 'Minimal',