Update index.md

Merge pull request #66 from defold/dev-update-to-android-billing-7-0-0
Update to Google Play Billing 7 0 0
2025-06-27 10:27:46 +02:00 · 2025-06-04 07:54:03 +02:00 · 2025-02-11 22:23:42 +01:00 · 2025-02-11 13:58:34 +01:00 · 2024-07-04 15:18:13 +02:00 · 2024-07-04 15:04:32 +02:00
8 changed files with 25 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,3 +9,5 @@ Thumbs.db
 .cproject
 builtins
 _site
+manifest.private.der
+manifest.public.der
--- a/docs/index.md
+++ b/docs/index.md
@ -234,6 +234,3 @@ On iOS, the "price_string" field contains '~' characters
 ## Source code

 The source code is available on [GitHub](https://github.com/defold/extension-iap)
-
-
-## API reference
--- a/extension-iap/manifests/android/build.gradle
+++ b/extension-iap/manifests/android/build.gradle
@ -1,3 +1,7 @@
-dependencies {
-    implementation 'com.android.billingclient:billing:5.0.0'
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'com.android.billingclient:billing:7.0.0'
 }
--- a/extension-iap/src/iap.h
+++ b/extension-iap/src/iap.h
@ -31,6 +31,7 @@ enum BillingResponse
    BILLING_RESPONSE_RESULT_ERROR = 6,
    BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7,
    BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8,
+    BILLING_RESPONSE_RESULT_NETWORK_ERROR = 9,
 };

 enum ProviderId
--- a/extension-iap/src/java/com/defold/iap/IapGooglePlay.java
+++ b/extension-iap/src/java/com/defold/iap/IapGooglePlay.java
@ -21,6 +21,7 @@ import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClient.BillingResponseCode;
 import com.android.billingclient.api.BillingClient.ProductType;
 import com.android.billingclient.api.BillingResult;
+import com.android.billingclient.api.PendingPurchasesParams;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.Purchase.PurchaseState;
 import com.android.billingclient.api.ProductDetails;
@ -56,7 +57,8 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
        this.activity = activity;
        this.autoFinishTransactions = autoFinishTransactions;

-        billingClient = BillingClient.newBuilder(activity).setListener(this).enablePendingPurchases().build();
+        PendingPurchasesParams pendingPurchasesParams = PendingPurchasesParams.newBuilder().enableOneTimeProducts().build();
+        billingClient = BillingClient.newBuilder(activity).setListener(this).enablePendingPurchases(pendingPurchasesParams).build();
        billingClient.startConnection(new BillingClientStateListener() {
            @Override
            public void onBillingSetupFinished(BillingResult billingResult) {
@ -221,7 +223,6 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
            case BillingResponseCode.OK:
                defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_OK;
                break;
-            case BillingResponseCode.SERVICE_TIMEOUT:
            case BillingResponseCode.SERVICE_UNAVAILABLE:
            case BillingResponseCode.SERVICE_DISCONNECTED:
                defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE;
@ -229,6 +230,9 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
            case BillingResponseCode.USER_CANCELED:
                defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_USER_CANCELED;
                break;
+            case BillingResponseCode.NETWORK_ERROR:  // new in Play Billing Library 6.0.0
+                defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_NETWORK_ERROR;
+                break;
            case BillingResponseCode.FEATURE_NOT_SUPPORTED:
            case BillingResponseCode.ERROR:
            default:
--- a/extension-iap/src/java/com/defold/iap/IapJNI.java
+++ b/extension-iap/src/java/com/defold/iap/IapJNI.java
@ -18,6 +18,7 @@ public class IapJNI implements IListProductsListener, IPurchaseListener {
    public static final int BILLING_RESPONSE_RESULT_ERROR = 6;
    public static final int BILLING_RESPONSE_RESULT_ITEM_ALREADY_OWNED = 7;
    public static final int BILLING_RESPONSE_RESULT_ITEM_NOT_OWNED = 8;
+    public static final int BILLING_RESPONSE_RESULT_NETWORK_ERROR = 9;

    public IapJNI() {
    }
--- a/game.project
+++ b/game.project
@ -11,8 +11,8 @@ height = 1136
 [android]
 input_method = HiddenInputField
 package = com.defold.extension.iap
-version_code = 7
-target_sdk_version = 29
+version_code = 9
+minimum_sdk_version = 21

 [project]
 title = extension-iap
--- a/main/main.gui_script
+++ b/main/main.gui_script
@ -44,7 +44,13 @@ end

 local function buy(id)
 	log("iap.buy() " .. id)
-	iap.buy(id)
+	local options = {}
+	local item = available_items[id]
+	if item.subscriptions then
+		local subscription = item.subscriptions[1]
+		options.token = subscription.token
+	end
+	iap.buy(id, options)
 end

 local function restore()
Author	SHA1	Message	Date
Björn Ritzl	88028fd29f	Update index.md	2025-06-04 07:54:03 +02:00
Björn Ritzl	c0e35039f4	Merge pull request #66 from defold/dev-update-to-android-billing-7-0-0 Update to Google Play Billing 7 0 0	2025-02-11 22:23:42 +01:00
Björn Ritzl	2e17b2f413	Merge branch 'master' into dev-update-to-android-billing-7-0-0	2025-02-11 13:58:34 +01:00
Björn Ritzl	f398677d7b	Merge pull request #68 from defold/dev-update-to-android-billing-6-0-1 Update to android billing 6.2.1	2024-07-04 15:18:13 +02:00
Björn Ritzl	d1c4e88562	Update build.gradle	2024-07-04 15:04:32 +02:00
Björn Ritzl	6f06d7f08f	Updated to 6.0.1	2024-07-04 14:52:58 +02:00
Björn Ritzl	0852e42977	Update .gitignore	2024-07-04 14:36:12 +02:00
Björn Ritzl	33174f25ea	Merge branch 'master' into dev-update-to-android-billing-7-0-0	2024-07-03 19:27:05 +02:00
Björn Ritzl	ba0e1b645a	Merge pull request #65 from defold/dev-update-to-android-billing-6-0-0 Updated to Play Billing 6.0.0	2024-07-03 19:26:34 +02:00
Björn Ritzl	801179288e	Include the offer token when buying	2024-07-03 19:25:36 +02:00
Björn Ritzl	1c27130eef	Updated to Billing 7.0.0	2024-07-03 19:06:50 +02:00
Björn Ritzl	195ef400b5	Play Billing 6.0.0	2024-07-02 22:33:09 +02:00