Skip to content
This repository has been archived by the owner on Nov 6, 2024. It is now read-only.

Commit

Permalink
Merge pull request #61 from xamarin/42.1021.1
Browse files Browse the repository at this point in the history 
42.1021.1
  • Loading branch information
@Redth
Redth authored May 10, 2017
2 parents 08dc0d1 + 6a7b37d commit e7c4030
Show file tree
Hide file tree
Showing 8 changed files with 82 additions and 14 deletions.
3 changes: 2 additions & 1 deletion auth-base/source/Transforms/Metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
<attr path="/api/*/*/method[@name='writeToParcel']/parameter[@name='p0']" name="managedName">dest</attr>
<attr path="/api/*/*/method[@name='writeToParcel']/parameter[@name='p1']" name="managedName">flags</attr>

<attr path="/api/package[@name='com.google.android.gms.auth']/class[@name='zze']" name="obfuscated">falsed</attr>
<!--<attr path="/api/package[@name='com.google.android.gms.auth']/class[@name='zze']" name="obfuscated">falsed</attr>-->
<attr path="/api/package[@name='com.google.android.gms.auth']/class[@name='GoogleAuthUtil']" name="extends">Java.Lang.Object</attr>

<!-- TODO: Consider removing when Cycle 9 is released -->
<remove-node path="/api/package[@name='com.google.android.gms.auth.api.proxy']/class[@name='zzd']/implements[@name='android.os.Parcelable.Creator']" />
Expand Down
2 changes: 1 addition & 1 deletion build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 2 additions & 0 deletions cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
<dependency id="Xamarin.GooglePlayServices.Base" version="[$version$]"/>
<dependency id="Xamarin.GooglePlayServices.Basement" version="[$version$]" />
<dependency id="Xamarin.GooglePlayServices.Cast" version="[$version$]" />
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="25.1.0" />
<dependency id="Xamarin.Android.Support.v7.MediaRouter" version="25.1.0" />
</group>
</dependencies>
</metadata>
Expand Down
28 changes: 22 additions & 6 deletions cast-framework/source/Cast.Framework.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Compat">
<HintPath>..\..\packages\Xamarin.Android.Support.Compat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Compat.dll</HintPath>
</Reference>
Expand All @@ -72,6 +66,23 @@
<HintPath>..\..\packages\Xamarin.Android.Support.v4.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v4.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
<HintPath>..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
<HintPath>..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.Palette">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.Palette.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down Expand Up @@ -115,4 +126,9 @@
<Import Project="..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Media.Compat.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Media.Compat.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Fragment.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.v4.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v4.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.AppCompat.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.v7.AppCompat.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.Palette.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.v7.Palette.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.targets')" />
</Project>
5 changes: 5 additions & 0 deletions cast-framework/source/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.Compat" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.Core.UI" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.Core.Utils" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.Fragment" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.Media.Compat" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.v4" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.v7.Palette" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.1.0" targetFramework="monoandroid70" />
<package id="Xamarin.Build.Download" version="0.4.2" targetFramework="monoandroid70" />
</packages>
8 changes: 6 additions & 2 deletions places/source/Transforms/Metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@


<attr path="/api/package[@name='com.google.android.gms.location.places']/class[@name='zza']" name="obfuscated">false</attr>
<attr path="/api/package[@name='com.google.android.gms.location.places.ui ']/class[@name='zza']" name="obfuscated">false</attr>

<attr path="/api/package[@name='com.google.android.gms.location.places.ui']/class[@name='zza']" name="obfuscated">false</attr>
<attr path="/api/package[@name='com.google.android.gms.location.places.ui']/class[@name='zza.zza']" name="obfuscated">false</attr>
<!--<attr path="/api/package[@name='com.google.android.gms.location.places.ui']/class[@name='PlacePicker']" name="extends">Java.Lang.Object</attr>
<attr path="/api/package[@name='com.google.android.gms.location.places.ui']/class[@name='PlaceAutocomplete']" name="extends">Java.Lang.Object</attr>
-->
<attr path="/api/package[@name='com.google.android.gms.location.places']/class[@name='AutocompletePredictionBuffer']/method[@name='get' and count(parameter)=1 and parameter[1][@type='int']]" name="managedReturn">Java.Lang.Object</attr>
<attr path="/api/package[@name='com.google.android.gms.location.places']/class[@name='PlaceBuffer']/method[@name='get' and count(parameter)=1 and parameter[1][@type='int']]" name="managedReturn">Java.Lang.Object</attr>
<attr path="/api/package[@name='com.google.android.gms.location.places']/class[@name='PlaceLikelihoodBuffer']/method[@name='get' and count(parameter)=1 and parameter[1][@type='int']]" name="managedReturn">Java.Lang.Object</attr>
Expand All @@ -42,6 +45,7 @@
<!-- Remove some internal namespaces -->
<remove-node path="/api/package[contains(@name, 'com.google.android.gms.internal')]" />

<attr path="/api/package[@name='com.google.android.gms.location.places']/class[@name='zza']" name="visibility">public</attr>
<attr path="/api/package[@name='com.google.android.gms.location.places.ui']/class[@name='zza']" name="visibility">public</attr>
<attr path="/api/package[@name='com.google.android.gms.location.places.ui']/class[@name='zza.zza']" name="managedName">ZzaInner</attr>
<attr path="/api/package[@name='com.google.android.gms.location.places.ui']/class[@name='zza.zza']" name="visibility">public</attr>
Expand Down
2 changes: 2 additions & 0 deletions safetynet/source/Transforms/Metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

<attr path="/api/package[@name='com.google.android.gms.safetynet']/class[@name='SafetyNet']" name="managedName">SafetyNetClass</attr>

<attr path="/api/package[@name='com.google.android.gms.safetynet']/class[@name='SafetyNetClient']" name="extends">Java.Lang.Object</attr>

<!-- Remove some internal namespaces -->
<remove-node path="/api/package[contains(@name, 'com.google.android.gms.internal')]" />

Expand Down
46 changes: 42 additions & 4 deletions tests/GooglePlayServices.Tests/Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

0 comments on commit e7c4030

Please sign in to comment.