From 42b086a22b1b7bf23a49e9bb928644600fe57e05 Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 9 May 2017 10:24:56 -0400 Subject: [PATCH 1/8] Fix missing GoogleAuthUtil --- auth-base/source/Transforms/Metadata.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/auth-base/source/Transforms/Metadata.xml b/auth-base/source/Transforms/Metadata.xml index b93e5462c..037b195f8 100644 --- a/auth-base/source/Transforms/Metadata.xml +++ b/auth-base/source/Transforms/Metadata.xml @@ -21,7 +21,8 @@ dest flags - falsed + + Java.Lang.Object From ad5818df11828a556f1375bc79174f8d94c356d1 Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 9 May 2017 10:25:12 -0400 Subject: [PATCH 2/8] Fix missing PlacePicker and PlaceAutocomplete --- places/source/Transforms/Metadata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/places/source/Transforms/Metadata.xml b/places/source/Transforms/Metadata.xml index a3077e6cc..f79d9675d 100644 --- a/places/source/Transforms/Metadata.xml +++ b/places/source/Transforms/Metadata.xml @@ -29,6 +29,8 @@ false false + Java.Lang.Object + Java.Lang.Object Java.Lang.Object Java.Lang.Object From c36eb39c47fd4fbb82478a5f08bafbdf4e7ec618 Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 9 May 2017 10:25:23 -0400 Subject: [PATCH 3/8] Fix inheritance for safetynetclient --- safetynet/source/Transforms/Metadata.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/safetynet/source/Transforms/Metadata.xml b/safetynet/source/Transforms/Metadata.xml index 471a42a34..318a62f66 100644 --- a/safetynet/source/Transforms/Metadata.xml +++ b/safetynet/source/Transforms/Metadata.xml @@ -7,6 +7,8 @@ SafetyNetClass + Java.Lang.Object + From f7dcf145a6db2c2c11332a9dc82a9a69dce695a3 Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 9 May 2017 11:15:14 -0400 Subject: [PATCH 4/8] Fixed PlacePicker and PlaceAutocomplete (again) --- places/source/Transforms/Metadata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/places/source/Transforms/Metadata.xml b/places/source/Transforms/Metadata.xml index f79d9675d..0ce508367 100644 --- a/places/source/Transforms/Metadata.xml +++ b/places/source/Transforms/Metadata.xml @@ -28,9 +28,9 @@ false - false - Java.Lang.Object - Java.Lang.Object + false + Java.Lang.Object + Java.Lang.Object Java.Lang.Object Java.Lang.Object From 551eb7c4451e5d037a55d14089f1d17e6af9fbf6 Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 9 May 2017 11:15:39 -0400 Subject: [PATCH 5/8] Fix missing ExpandedControllerActivity --- ...layServices.Cast.Framework.template.nuspec | 2 ++ cast-framework/source/Cast.Framework.csproj | 28 +++++++++++++++---- cast-framework/source/packages.config | 5 ++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec b/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec index 349778589..af02fb1b1 100644 --- a/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec +++ b/cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec @@ -20,6 +20,8 @@ + + diff --git a/cast-framework/source/Cast.Framework.csproj b/cast-framework/source/Cast.Framework.csproj index 8cdda44d4..b239ed19f 100644 --- a/cast-framework/source/Cast.Framework.csproj +++ b/cast-framework/source/Cast.Framework.csproj @@ -47,12 +47,6 @@ - - ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll - ..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll @@ -72,6 +66,23 @@ ..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll False + + ..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll + + + ..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll + + + ..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll + False + + + ..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll + + + ..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll + False + @@ -115,4 +126,9 @@ + + + + + diff --git a/cast-framework/source/packages.config b/cast-framework/source/packages.config index 247b0876a..a69fe88c9 100644 --- a/cast-framework/source/packages.config +++ b/cast-framework/source/packages.config @@ -1,10 +1,15 @@  + + + + + \ No newline at end of file From bb8c7bf196fbfe298dc92702048f993ad259dab7 Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 9 May 2017 11:16:12 -0400 Subject: [PATCH 6/8] Added more tests --- tests/GooglePlayServices.Tests/Tests.cs | 46 ++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/tests/GooglePlayServices.Tests/Tests.cs b/tests/GooglePlayServices.Tests/Tests.cs index 5eb88f7da..ec5b30171 100644 --- a/tests/GooglePlayServices.Tests/Tests.cs +++ b/tests/GooglePlayServices.Tests/Tests.cs @@ -11,23 +11,61 @@ namespace GooglePlayServices.Tests public class Tests { [Fact] - public void GooglePlayServicesUtil_Exists () + public void Common_GooglePlayServicesUtil_Exists() { var versionCode = Android.Gms.Common.GooglePlayServicesUtil.GooglePlayServicesVersionCode; - Console.WriteLine("Google Play Services Version: {0}", versionCode); + Console.WriteLine("Common.GooglePlayServicesUtil.GooglePlayServicesVersionCode: {0}", versionCode); Assert.True(versionCode > 0); } [Fact] - public void GoogleApiAvailability_Exists() + public void Common_GoogleApiAvailability_Exists() { var versionCode = Android.Gms.Common.GoogleApiAvailability.GooglePlayServicesVersionCode; - Console.WriteLine("Google Play Services Version: {0}", versionCode); + Console.WriteLine("Common.GoogleApiAvailability.GooglePlayServicesVersionCode:: {0}", versionCode); Assert.True(versionCode > 0); } + + [Fact] + public void Auth_GoogleAuthUtil_Exists() + { + var googleAccountType = Android.Gms.Auth.GoogleAuthUtil.GoogleAccountType; + + Console.WriteLine("Auth.GoogleAuthUtil.GoogleAccountType: {0}", googleAccountType); + + Assert.True(googleAccountType != null); + } + + [Fact] + public void Location_Places_UI_PlacePicker_Exists() + { + var resErr = Android.Gms.Location.Places.UI.PlacePicker.ResultError; + + Console.WriteLine("Location.Places.UI.PlacePicker.ResultError: {0}", resErr); + + Assert.True(resErr == 2); + } + + [Fact] + public void Location_Places_UI_PlaceAutocomplete_Exists() + { + var resErr = Android.Gms.Location.Places.UI.PlaceAutocomplete.ResultError; + + Console.WriteLine("Location.Places.UI.PlaceAutocomplete.ResultError: {0}", resErr); + + Assert.True(resErr == 2); + } + + [Fact] + public void Cast_Framework_Media_Widget_ExpandedControllerActivity_Exists() + { + var a = Android.Gms.Cast.Framework.Media.Widget.ExpandedControllerActivity.ActivityService; + + Assert.True(a != null); + } } } From 80f8976f89b4fcbc605dce0666e83f850da13f5f Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 9 May 2017 12:08:53 -0400 Subject: [PATCH 7/8] Bump nuget version --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index b7ea79a82..b208458fb 100644 --- a/build.cake +++ b/build.cake @@ -24,7 +24,7 @@ var BASE_API_INFO_URL = "https://github.com/xamarin/GooglePlayServicesComponents var COMMON_NUGET_VERSION = ""; var PLAY_COMPONENT_VERSION = "42.1021.0.0"; -var PLAY_NUGET_VERSION = "42.1021.0" + COMMON_NUGET_VERSION; +var PLAY_NUGET_VERSION = "42.1021.1" + COMMON_NUGET_VERSION; var PLAY_AAR_VERSION = "10.2.1"; var VERSION_DESC = "10.2.1"; From 6a7b37d3af3d78eaccb762181c6041b0db1ce42b Mon Sep 17 00:00:00 2001 From: Redth Date: Tue, 9 May 2017 16:01:13 -0400 Subject: [PATCH 8/8] Fixes missing PlacePicker.IntentBuilder binding --- places/source/Transforms/Metadata.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/places/source/Transforms/Metadata.xml b/places/source/Transforms/Metadata.xml index 0ce508367..acfc45d76 100644 --- a/places/source/Transforms/Metadata.xml +++ b/places/source/Transforms/Metadata.xml @@ -29,9 +29,10 @@ false false - Java.Lang.Object + false + Java.Lang.Object Java.Lang.Object Java.Lang.Object @@ -44,6 +45,7 @@ + public public ZzaInner public