update GooglePlayServices binding sample to gms 4.1.32.aar.

So, Cast SDK is not yet published on google site yet, but we're getting ready.
ThinkingMelody · Feb 4, 2014 · 2c03210 · 2c03210
1 parent ed62f89
commit 2c03210
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 4 deletions.
diff --git a/GooglePlayServices/GooglePlayServices/Additions/BugWorkarounds.cs b/GooglePlayServices/GooglePlayServices/Additions/BugWorkarounds.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using Android.Runtime;
+
+namespace Android.Gms.Drives {
+	public abstract partial class Metadata
+	{
+		// FIXME: For some reason, IFreezable<T> methods are not generated as abstract in Metadata.
+		// Once this bug got fixed, this should go away (otherwise it will fail to build).
+		public abstract Java.Lang.Object Freeze ();
+	}
+	internal partial class MetadataInvoker : Metadata
+	{
+		IntPtr id_freeze;
+		// FIXME: For some reason, IFreezable<T> methods are not generated as abstract in Metadata.
+		// Once this bug got fixed, this should go away (otherwise it will fail to build).
+		public override Java.Lang.Object Freeze ()
+		{
+			if (id_freeze == IntPtr.Zero)
+				id_freeze = JNIEnv.GetMethodID (class_ref, "freeze", "()Ljava/lang/Object;");
+			return (Java.Lang.Object) global::Java.Lang.Object.GetObject<global::Java.Lang.Object> (JNIEnv.CallObjectMethod  (Handle, id_freeze), JniHandleOwnership.TransferLocalRef);
+		}
+	}
+}
diff --git a/GooglePlayServices/GooglePlayServices/GooglePlayServices.csproj b/GooglePlayServices/GooglePlayServices/GooglePlayServices.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2DDFEFA4-4944-42A7-971E-A2F751BA6036}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -12,7 +12,8 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AssemblyName>GooglePlayServices</AssemblyName>
-    <DroidDocPaths>../docs/reference</DroidDocPaths>
+    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -44,6 +45,7 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Additions\AssemblyInfo.cs" />
+    <Compile Include="Additions\BugWorkarounds.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Additions\AboutAdditions.txt" />
@@ -55,4 +57,13 @@
     <TransformFile Include="Transforms\Metadata.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Xamarin.Android.Bindings.targets" />
+  <ItemGroup>
+    <Folder Include="Docs\" />
+  </ItemGroup>
+  <ItemGroup>
+    <LibraryProjectZip Include="Jars\play-services-4.1.32.aar" />
+  </ItemGroup>
+  <ItemGroup>
+    <JavaDocIndex Include="Docs\reference\packages.html" />
+  </ItemGroup>
 </Project>
diff --git a/GooglePlayServices/GooglePlayServices/Transforms/Metadata.xml b/GooglePlayServices/GooglePlayServices/Transforms/Metadata.xml
@@ -6,21 +6,45 @@
 	<attr path="/api/package[@name='com.google.android.gms.appstate']" name="managedName">Android.Gms.AppStates</attr>
 	<attr path="/api/package[@name='com.google.android.gms.auth']" name="managedName">Android.Gms.Auth</attr>
 	<attr path="/api/package[@name='com.google.android.gms.common']" name="managedName">Android.Gms.Common</attr>  
+    <attr path="/api/package[@name='com.google.android.gms.common.annotation']" name="managedName">Android.Gms.Common.Annotations</attr>
+    <attr path="/api/package[@name='com.google.android.gms.common.api']" name="managedName">Android.Gms.Common.Apis</attr>
 	<attr path="/api/package[@name='com.google.android.gms.common.data']" name="managedName">Android.Gms.Common.Data</attr>  
 	<attr path="/api/package[@name='com.google.android.gms.common.images']" name="managedName">Android.Gms.Common.Images</attr>  
+	<attr path="/api/package[@name='com.google.android.gms.drive']" name="managedName">Android.Gms.Drives</attr>  
+	<attr path="/api/package[@name='com.google.android.gms.drive.query']" name="managedName">Android.Gms.Drives.Query</attr>  
+	<attr path="/api/package[@name='com.google.android.gms.drive.widget']" name="managedName">Android.Gms.Drives.Widgets</attr>  
+	<!-- FIXME: fix build issues and enable this -->
+	<!--attr path="/api/package[@name='com.google.android.gms.drive.metadata']" name="managedName">Android.Gms.Drives.MetadataTypes</attr-->
+	<remove-node path="/api/package[@name='com.google.android.gms.drive.metadata']" />
 	<attr path="/api/package[@name='com.google.android.gms.dynamic']" name="managedName">Android.Gms.Dynamic</attr>
 	<attr path="/api/package[@name='com.google.android.gms.games']" name="managedName">Android.Gms.Games</attr>  
 	<attr path="/api/package[@name='com.google.android.gms.games.achievement']" name="managedName">Android.Gms.Games.Achievement</attr>  
 	<attr path="/api/package[@name='com.google.android.gms.games.leaderboard']" name="managedName">Android.Gms.Games.LeaderBoard</attr>  
 	<attr path="/api/package[@name='com.google.android.gms.games.multiplayer']" name="managedName">Android.Gms.Games.MultiPlayer</attr>  
-	<attr path="/api/package[@name='com.google.android.gms.gcm']" name="managedName">Android.Gms.Gcm</attr>  
+	<attr path="/api/package[@name='com.google.android.gms.games.multiplayer.realtime']" name="managedName">Android.Gms.Games.MultiPlayer.RealTime</attr>  
+	<attr path="/api/package[@name='com.google.android.gms.games.multiplayer.turnbased']" name="managedName">Android.Gms.Games.MultiPlayer.TurnBased</attr>  
+	<attr path="/api/package[@name='com.google.android.gms.gcm']" name="managedName">Android.Gms.Gcm</attr>
 	<attr path="/api/package[@name='com.google.android.gms.location']" name="managedName">Android.Gms.Location</attr>
 	<attr path="/api/package[@name='com.google.android.gms.maps']" name="managedName">Android.Gms.Maps</attr>
 	<attr path="/api/package[@name='com.google.android.gms.maps.model']" name="managedName">Android.Gms.Maps.Model</attr>
 	<attr path="/api/package[@name='com.google.android.gms.panorama']" name="managedName">Android.Gms.Panorama</attr>
 	<attr path="/api/package[@name='com.google.android.gms.plus']" name="managedName">Android.Gms.Plus</attr>
 	<attr path="/api/package[@name='com.google.android.gms.plus.model.moments']" name="managedName">Android.Gms.Plus.Model.Moments</attr>
 	<attr path="/api/package[@name='com.google.android.gms.plus.model.people']" name="managedName">Android.Gms.Plus.Model.People</attr>
+	<attr path="/api/package[@name='com.google.android.gms.wallet']" name="managedName">Android.Gms.Wallet</attr>
+
+    <attr path="/api/package[@name='com.google.ads']" name="managedName">Android.Ads</attr>
+    <attr path="/api/package[@name='com.google.ads.mediation']" name="managedName">Android.Ads.Mediation</attr>
+    <attr path="/api/package[@name='com.google.ads.mediation.admob']" name="managedName">Android.Ads.Mediation.AdMob</attr>
+    <attr path="/api/package[@name='com.google.ads.mediation.customevent']" name="managedName">Android.Ads.Mediation.CustomEvents</attr>
+    <attr path="/api/package[@name='com.google.ads.mediation.jsadapter']" name="managedName">Android.Ads.Mediation.JavaScriptAdapters</attr>
+    <attr path="/api/package[@name='com.google.android.gms.ads']" name="managedName">Android.Gms.Ads</attr>
+    <attr path="/api/package[@name='com.google.android.gms.ads.doubleclick']" name="managedName">Android.Gms.Ads.DoubleClick</attr>
+    <attr path="/api/package[@name='com.google.android.gms.ads.identifier']" name="managedName">Android.Gms.Ads.Identifiers</attr>
+    <attr path="/api/package[@name='com.google.android.gms.ads.mediation']" name="managedName">Android.Gms.Ads.Mediation</attr>
+    <attr path="/api/package[@name='com.google.android.gms.ads.mediation.admob']" name="managedName">Android.Gms.Ads.Mediation.AdMob</attr>
+    <attr path="/api/package[@name='com.google.android.gms.ads.mediation.customevent']" name="managedName">Android.Gms.Ads.Mediation.CustomEvents</attr>
+    <attr path="/api/package[@name='com.google.android.gms.ads.search']" name="managedName">Android.Gms.Ads.Search</attr>
 
   	<attr path="/api/package[@name='com.google.android.gms.maps.model']/class[@name='MarkerOptions']/method[@name='position']" name="managedName">SetPosition</attr>
 	<attr path="/api/package[@name='com.google.android.gms.maps.model']/class[@name='MarkerOptions']/method[@name='snippet']" name="managedName">SetSnippet</attr>
@@ -43,4 +67,30 @@
 
 	<attr path="/api/package/class/method[@name='createFromParcel']" name="managedReturn">Java.Lang.Object</attr>
 	<attr path="/api/package/class/method[@name='newArray']" name="managedReturn">Java.Lang.Object[]</attr>
+
+    <attr path="/api/package[@name='com.google.android.gms.wallet']/interface[@name='NotifyTransactionStatusRequest.Status']" name="managedName">StatusType</attr>
+
+    <attr path="/api/package[@name='com.google.android.gms.wallet']/interface[@name='LineItem.Role']" name="managedName">RoleType</attr>
+
+    <attr path="/api/package[@name='com.google.android.gms.drive']/class[@name='MetadataBuffer']/method[@name='get']" name="managedReturn">Java.Lang.Object</attr>
+    <attr path="/api/package[@name='com.google.android.gms.games.multiplayer.turnbased']/class[@name='TurnBasedMatchEntity']/method[@name='freeze']" name="managedReturn">Java.Lang.Object</attr>
+
+    <attr path="/api/package[@name='com.google.android.gms.common.api']/class[@name='Status']" name="managedName">Statuses</attr>
+
+    <!-- FIXME: this type is removed only because javadoc-to-mdoc crashes because of it -->
+    <remove-node path="/api/package[@name='com.google.android.gms.wallet']/class[@name='WalletConstants']" />
+
+  <!-- AdMob -->
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onDismissScreen']" name="argsType">BannerDismissScreenEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onFailedToReceiveAd']" name="argsType">BannerFailedToReceiveAdEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onLeaveApplication']" name="argsType">BannerLeaveApplicationEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onPresentScreen']" name="argsType">BannerPresentScreenEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationBannerListener']/method[@name='onReceivedAd']" name="argsType">BannerReceiveAdEventArgs</attr>
+
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onDismissScreen']" name="argsType">IntersitionalDismissScreenEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onFailedToReceiveAd']" name="argsType">IntersitionalFailedToReceiveAdEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onLeaveApplication']" name="argsType">InterstitialLeaveApplicationEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onPresentScreen']" name="argsType">InterstitialPresentScreenEventArgs</attr>
+  <attr path="/api/package[@name='com.google.ads.mediation']/interface[@name='MediationInterstitialListener']/method[@name='onReceivedAd']" name="argsType">InterstitialReceiveAdEventArgs</attr>
+
 </metadata>
diff --git a/GooglePlayServices/GooglePlayServicesTest/GooglePlayServicesTest.csproj b/GooglePlayServices/GooglePlayServicesTest/GooglePlayServicesTest.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F15E1FA5-4390-416B-96B8-66CC6179DD10}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -16,6 +16,8 @@
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AssemblyName>GooglePlayServicesTest</AssemblyName>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>