Update billing to v6.0.1

app/src/googleplay/java/org/tasks/billing/BillingClientImpl.kt

@@ -13,10 +13,11 @@ import com.android.billingclient.api.BillingFlowParams.SubscriptionUpdateParams
 import com.android.billingclient.api.BillingResult
 import com.android.billingclient.api.ConsumeParams
 import com.android.billingclient.api.Purchase.PurchaseState
-import com.android.billingclient.api.Purchase.PurchasesResult
+import com.android.billingclient.api.PurchasesResult
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.SkuDetailsParams
 import com.android.billingclient.api.consumePurchase
+import com.android.billingclient.api.queryPurchasesAsync
 import com.android.billingclient.api.querySkuDetails
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
@@ -48,8 +49,8 @@ class BillingClientImpl(
     override suspend fun queryPurchases(throwError: Boolean) = try {
         executeServiceRequest {
             withContext(Dispatchers.IO + NonCancellable) {
-                val subs = billingClient.queryPurchases(SkuType.SUBS)
-                val iaps = billingClient.queryPurchases(SkuType.INAPP)
+                val subs = billingClient.queryPurchasesAsync(SkuType.SUBS)
+                val iaps = billingClient.queryPurchasesAsync(SkuType.INAPP)
                 if (subs.success || iaps.success) {
                     withContext(Dispatchers.Main) {
                         inventory.clear()
@@ -198,7 +199,7 @@ class BillingClientImpl(
         const val STATE_PURCHASED = PurchaseState.PURCHASED
 
         private val PurchasesResult.success: Boolean
-            get() = responseCode == BillingResponseCode.OK
+            get() = billingResult.responseCode == BillingResponseCode.OK
 
         private val BillingResult.success: Boolean
             get() = responseCode == BillingResponseCode.OK
@@ -231,6 +232,6 @@ class BillingClientImpl(
             get() = billingResult.responseCodeString
 
         private val PurchasesResult.purchases: List<com.android.billingclient.api.Purchase>
-            get() = purchasesList ?: emptyList()
+            get() = purchasesList
     }
 }

deps_googleplay.txt

@@ -438,8 +438,11 @@
 +|    +--- androidx.fragment:fragment:1.0.0 -> 1.6.1 (*)
 +|    +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
 +|    \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
-++--- com.android.billingclient:billing-ktx:4.1.0
-+|    +--- com.android.billingclient:billing:4.1.0
+++--- com.android.billingclient:billing-ktx:6.0.1
++|    +--- com.android.billingclient:billing:6.0.1
++|    |    +--- com.google.android.datatransport:transport-api:3.0.0 (*)
++|    |    +--- com.google.android.datatransport:transport-backend-cct:3.1.8 -> 3.1.9 (*)
++|    |    \--- com.google.android.datatransport:transport-runtime:3.1.8 -> 3.1.9 (*)
 +|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.9.10 (*)
 +|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.1 (*)
 ++--- com.google.android.play:core:1.10.3

gradle/libs.versions.toml

@@ -46,7 +46,6 @@ opentasks = "562fec5"
 osmdroid = "6.1.17"
 oss-licenses-plugin = "0.10.6"
 persistent-cookiejar = "1.0.1"
-play-billing-ktx = "4.1.0"
 play-core-ktx = "1.8.1"
 play-core = "1.10.3"
 play-services-maps = "18.1.0"
@@ -147,7 +146,7 @@ okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.
 osmdroid = { module = "org.osmdroid:osmdroid-android", version.ref = "osmdroid" }
 oss-licenses-plugin = { module = "com.google.android.gms:oss-licenses-plugin", version.ref = "oss-licenses-plugin" }
 persistent-cookiejar = { module = "com.github.franmontiel:PersistentCookieJar", version.ref = "persistent-cookiejar" }
-play-billing-ktx = { module = "com.android.billingclient:billing-ktx", version.ref = "play-billing-ktx" }
+play-billing-ktx = { module = "com.android.billingclient:billing-ktx", version = "6.0.1" }
 play-core-ktx = { module = "com.google.android.play:core-ktx", version.ref = "play-core-ktx" }
 play-core = { module = "com.google.android.play:core", version.ref = "play-core" }
 play-services-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "play-services-maps" }