Merge branch 'feature/android-billing-client'

jamesmontemagno · Jun 1, 2020 · d543b4d · d543b4d
2 parents 3badebc + 51b8db9
commit d543b4d
Show file tree

Hide file tree

Showing 40 changed files with 7,614 additions and 5,023 deletions.
diff --git a/src/InAppBilling.sln b/src/InAppBilling.sln
diff --git a/src/InAppBillingTests/InAppBillingTests.Android/InAppBillingTests.Android.csproj b/src/InAppBillingTests/InAppBillingTests.Android/InAppBillingTests.Android.csproj
@@ -16,7 +16,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -52,12 +52,10 @@
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.697729" />
-    <PackageReference Include="Xamarin.Android.Support.Design" Version="27.0.2.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="27.0.2.1" />
-    <PackageReference Include="Xamarin.Android.Support.v4" Version="27.0.2.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="27.0.2.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="27.0.2.1" />
+    <PackageReference Include="Xamarin.Android.Google.BillingClient">
+      <Version>2.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms" Version="4.2.0.848062" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/src/InAppBillingTests/InAppBillingTests.Android/Properties/AndroidManifest.xml b/src/InAppBillingTests/InAppBillingTests.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.InAppBillingTests">
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
-    <application android:label="InAppBillingTests.Android"></application>
-</manifest>
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<application android:label="InAppBillingTests.Android"></application>
+</manifest>
diff --git a/src/InAppBillingTests/InAppBillingTests.Android/Resources/Resource.designer.cs b/src/InAppBillingTests/InAppBillingTests.Android/Resources/Resource.designer.cs
diff --git a/src/InAppBillingTests/InAppBillingTests.UWP/InAppBillingTests.UWP.csproj b/src/InAppBillingTests/InAppBillingTests.UWP/InAppBillingTests.UWP.csproj
@@ -146,7 +146,7 @@
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.697729" />
+    <PackageReference Include="Xamarin.Forms" Version="4.2.0.848062" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/InAppBillingTests/InAppBillingTests.iOS/InAppBillingTests.iOS.csproj b/src/InAppBillingTests/InAppBillingTests.iOS/InAppBillingTests.iOS.csproj
@@ -151,20 +151,10 @@
     <PackageReference Include="System.ValueTuple">
       <Version>4.5.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.697729" />
+    <PackageReference Include="Xamarin.Forms" Version="4.2.0.848062" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\..\Plugin.InAppBilling.Abstractions\Plugin.InAppBilling.Abstractions.csproj">
-      <Project>{ccd0ed8a-828b-4ac0-a5f2-666a8d5bfe03}</Project>
-      <Name>Plugin.InAppBilling.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugin.InAppBilling.iOS\Plugin.InAppBilling.iOS.csproj">
-      <Project>{2882aeeb-d4cd-4eb9-8a6c-6653b33681f0}</Project>
-      <Name>Plugin.InAppBilling.iOS</Name>
-      <IsAppExtension>false</IsAppExtension>
-      <IsWatchApp>false</IsWatchApp>
-    </ProjectReference>
     <ProjectReference Include="..\InAppBillingTests\InAppBillingTests.csproj">
       <Project>{4B28D0B8-D15A-43AD-B7A6-9C2338D39F86}</Project>
       <Name>InAppBillingTests</Name>

diff --git a/src/InAppBillingTests/InAppBillingTests/InAppBillingTests.csproj b/src/InAppBillingTests/InAppBillingTests/InAppBillingTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -11,11 +11,10 @@
 
   <ItemGroup>
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Xamarin.Forms" Version="3.1.0.697729" />
+    <PackageReference Include="Xamarin.Forms" Version="4.2.0.848062" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Plugin.InAppBilling.Abstractions\Plugin.InAppBilling.Abstractions.csproj" />
     <ProjectReference Include="..\..\Plugin.InAppBilling\Plugin.InAppBilling.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/InAppBillingTests/InAppBillingTests/MainPage.xaml.cs b/src/InAppBillingTests/InAppBillingTests/MainPage.xaml.cs
@@ -25,7 +25,7 @@ private async void ButtonNonConsumable_Clicked(object sender, EventArgs e)
 			var id = "iaptest";
 			try
 			{
-				var purchase = await CrossInAppBilling.Current.PurchaseAsync(id, Plugin.InAppBilling.Abstractions.ItemType.InAppPurchase, "mypayload");
+				var purchase = await CrossInAppBilling.Current.PurchaseAsync(id, ItemType.InAppPurchase, "mypayload");
 
 				if (purchase == null)
 				{
@@ -48,7 +48,7 @@ private async void ButtonSub_Clicked(object sender, EventArgs e)
 			var id = "renewsub";
 			try
 			{
-				var purchase = await CrossInAppBilling.Current.PurchaseAsync(id, Plugin.InAppBilling.Abstractions.ItemType.Subscription, "mypayload");
+				var purchase = await CrossInAppBilling.Current.PurchaseAsync(id, ItemType.Subscription, "mypayload");
 
 				if(purchase == null)
 				{
@@ -75,7 +75,7 @@ private async void ButtonRestore_Clicked(object sender, EventArgs e)
 		{
 			try
 			{
-				var purchases = await CrossInAppBilling.Current.GetPurchasesAsync(Plugin.InAppBilling.Abstractions.ItemType.Subscription);
+				var purchases = await CrossInAppBilling.Current.GetPurchasesAsync(ItemType.Subscription);
 
 				if (purchases == null)
 				{

diff --git a/src/Plugin.InAppBilling.Abstractions/Plugin.InAppBilling.Abstractions.csproj b/src/Plugin.InAppBilling.Abstractions/Plugin.InAppBilling.Abstractions.csproj
diff --git a/src/Plugin.InAppBilling.Android/Plugin.InAppBilling.Android.csproj b/src/Plugin.InAppBilling.Android/Plugin.InAppBilling.Android.csproj
diff --git a/src/Plugin.InAppBilling.Android/Properties/AssemblyInfo.cs b/src/Plugin.InAppBilling.Android/Properties/AssemblyInfo.cs
diff --git a/src/Plugin.InAppBilling.Android/Resources/AboutResources.txt b/src/Plugin.InAppBilling.Android/Resources/AboutResources.txt
diff --git a/src/Plugin.InAppBilling.Android/Resources/Resource.Designer.cs b/src/Plugin.InAppBilling.Android/Resources/Resource.Designer.cs