Merge branch 'master' into androidv7billing

jamesmontemagno · web-flow · commit 4adc9d3ccaf0 · 2024-10-18T16:38:05.000-07:00
diff --git a/src/Plugin.InAppBilling/CrossInAppBilling.shared.cs b/src/Plugin.InAppBilling/CrossInAppBilling.shared.cs
@@ -30,6 +30,7 @@ public static IInAppBilling Current
                 return ret;
             }
         }
+
 #if ANDROID || IOS || MACCATALYST || MACOS || WINDOWS
         static IInAppBilling CreateInAppBilling() => new InAppBillingImplementation();
 #else
diff --git a/src/Plugin.InAppBilling/Plugin.InAppBilling.csproj b/src/Plugin.InAppBilling/Plugin.InAppBilling.csproj
@@ -114,24 +114,36 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Ktx">
       <Version>2.8.6</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Ktx">
+      <Version>2.8.3.1</Version>
+    </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
       <Version>2.8.6</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx">
       <Version>2.8.6</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx">
+      <Version>2.8.3.1</Version>
+    </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime">
       <Version>2.8.6</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx">
       <Version>2.8.6</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx">
+      <Version>2.8.3.1</Version>
+    </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
       <Version>2.8.6</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx">
       <Version>2.8.6</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx">
+      <Version>2.8.3.1</Version>
+    </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState">
       <Version>2.8.6</Version>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public static IInAppBilling Current`
`30`	`30`	`return ret;`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+`
`33`	`34`	`#if ANDROID \|\| IOS \|\| MACCATALYST \|\| MACOS \|\| WINDOWS`
`34`	`35`	`static IInAppBilling CreateInAppBilling() => new InAppBillingImplementation();`
`35`	`36`	`#else`