Partydeck/IAP-Extension-Mirror
3
0
Fork 0
mirror of https://github.com/defold/extension-iap synced 2025-06-27 18:37:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Partydeck:master
Branches Tags
Partydeck:master
Partydeck:issue-33-restore-callback
Partydeck:6.3.0
Partydeck:6.2.0
Partydeck:6.1.0
Partydeck:6.0.0
Partydeck:5.1.1
Partydeck:5.1.0
Partydeck:5.0.1
Partydeck:5.0.0
Partydeck:4.0.0
Partydeck:3.3.2
Partydeck:3.3.1
Partydeck:3.3.0
Partydeck:3.2.0
Partydeck:3.1.1
Partydeck:3.1.0
Partydeck:3.0.2
Partydeck:3.0.1
Partydeck:3.0.0
Partydeck:2.0.2
Partydeck:2.0.1
Partydeck:2.0.0
Partydeck:1.4.0
Partydeck:1.3.0
Partydeck:1.2.3
Partydeck:1.2.2
Partydeck:1.2.1
Partydeck:1.2
Partydeck:1.1
Partydeck:1.0.1
Partydeck:1.0
..
compare: Partydeck:5.1.0
Branches Tags
Partydeck:master
Partydeck:issue-33-restore-callback
Partydeck:6.3.0
Partydeck:6.2.0
Partydeck:6.1.0
Partydeck:6.0.0
Partydeck:5.1.1
Partydeck:5.1.0
Partydeck:5.0.1
Partydeck:5.0.0
Partydeck:4.0.0
Partydeck:3.3.2
Partydeck:3.3.1
Partydeck:3.3.0
Partydeck:3.2.0
Partydeck:3.1.1
Partydeck:3.1.0
Partydeck:3.0.2
Partydeck:3.0.1
Partydeck:3.0.0
Partydeck:2.0.2
Partydeck:2.0.1
Partydeck:2.0.0
Partydeck:1.4.0
Partydeck:1.3.0
Partydeck:1.2.3
Partydeck:1.2.2
Partydeck:1.2.1
Partydeck:1.2
Partydeck:1.1
Partydeck:1.0.1
Partydeck:1.0

No commits in common. "master" and "5.1.0" have entirely different histories.
master ... 5.1.0

11 changed files with 20 additions and 125 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -9,5 +9,3 @@ Thumbs.db
.cproject
builtins
_site
manifest.private.der
manifest.public.der

5
docs/index.md
View File

@ -1,6 +1,6 @@
---
title: Defold In-app purchase extension API documentation
brief: This manual covers how to setup and use In-App Purchases in Defold.
brief: This manual covers how to setup and use Google Play Game Services in Defold.
---
# Defold In-app purchase extension API documentation
@ -234,3 +234,6 @@ 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

4
extension-iap/ext.manifest
View File

@ -1,6 +1,10 @@
name: IAPExt
platforms:
armv7-ios:
context:
weakFrameworks: ['StoreKit', 'UIKit', 'Foundation']
arm64-ios:
context:
weakFrameworks: ['StoreKit', 'UIKit', 'Foundation']

6
extension-iap/lib/web/library_facebook_iap.js
View File

@ -71,7 +71,7 @@ var LibraryFacebookIAP = {
if(url_index == product_count-1) {
var productsJSON = JSON.stringify(products);
var res_buf = stringToUTF8OnStack(productsJSON);
var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
{{{ makeDynCall('vii', 'callback')}}}(lua_callback, res_buf);
} else {
var xmlhttp = new XMLHttpRequest();
@ -143,7 +143,7 @@ var LibraryFacebookIAP = {
}
var productsJSON = JSON.stringify(result)
var res_buf = stringToUTF8OnStack(productsJSON);
var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
{{{ makeDynCall('viii', 'callback')}}}(lua_callback, res_buf, 0);
} else {
@ -166,4 +166,4 @@ var LibraryFacebookIAP = {
}
autoAddDeps(LibraryFacebookIAP, '$FBinner');
addToLibrary(LibraryFacebookIAP);
mergeInto(LibraryManager.library, LibraryFacebookIAP);

6
extension-iap/manifests/android/build.gradle
View File

@ -1,7 +1,3 @@
repositories {
mavenCentral()
}
dependencies {
implementation 'com.android.billingclient:billing:7.0.0'
implementation 'com.android.billingclient:billing:5.0.0'
}

1
extension-iap/src/iap.h
View File

@ -31,7 +31,6 @@ 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

8
extension-iap/src/java/com/defold/iap/IapGooglePlay.java
View File

@ -21,7 +21,6 @@ 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;
@ -57,8 +56,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
this.activity = activity;
this.autoFinishTransactions = autoFinishTransactions;
PendingPurchasesParams pendingPurchasesParams = PendingPurchasesParams.newBuilder().enableOneTimeProducts().build();
billingClient = BillingClient.newBuilder(activity).setListener(this).enablePendingPurchases(pendingPurchasesParams).build();
billingClient = BillingClient.newBuilder(activity).setListener(this).enablePendingPurchases().build();
billingClient.startConnection(new BillingClientStateListener() {
@Override
public void onBillingSetupFinished(BillingResult billingResult) {
@ -223,6 +221,7 @@ 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;
@ -230,9 +229,6 @@ 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:

1
extension-iap/src/java/com/defold/iap/IapJNI.java
View File

@ -18,7 +18,6 @@ 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() {
}

4
game.project
View File

@ -11,8 +11,8 @@ height = 1136
[android]
input_method = HiddenInputField
package = com.defold.extension.iap
version_code = 9
minimum_sdk_version = 21
version_code = 7
target_sdk_version = 29
[project]
title = extension-iap

100
main/main.gui
View File

@ -1,7 +1,7 @@
script: "/main/main.gui_script"
fonts {
name: "default"
font: "/builtins/fonts/default.font"
name: "system_font"
font: "/builtins/fonts/system_font.font"
}
background_color {
x: 0.0
@ -47,8 +47,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/button.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -104,10 +102,6 @@ nodes {
alpha: 1.0
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -172,10 +166,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -215,8 +205,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/button.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -273,10 +261,6 @@ nodes {
overridden_fields: 4
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -341,10 +325,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -380,7 +360,7 @@ nodes {
type: TYPE_TEXT
blend_mode: BLEND_MODE_ALPHA
text: "<text>"
font: "default"
font: "system_font"
id: "log"
xanchor: XANCHOR_NONE
yanchor: YANCHOR_NONE
@ -407,10 +387,6 @@ nodes {
template_node_child: false
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -450,8 +426,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/button.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -507,10 +481,6 @@ nodes {
alpha: 1.0
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -575,10 +545,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -618,8 +584,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/button.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -675,10 +639,6 @@ nodes {
alpha: 1.0
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -743,10 +703,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -786,8 +742,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/button.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -844,10 +798,6 @@ nodes {
overridden_fields: 4
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -912,10 +862,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -955,8 +901,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/button.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -1012,10 +956,6 @@ nodes {
alpha: 1.0
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -1080,10 +1020,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -1123,8 +1059,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/button.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -1181,10 +1115,6 @@ nodes {
overridden_fields: 4
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -1249,10 +1179,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -1292,8 +1218,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/checkbox_label.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -1349,10 +1273,6 @@ nodes {
alpha: 1.0
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -1417,10 +1337,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -1460,8 +1376,6 @@ nodes {
alpha: 1.0
template: "/dirtylarry/checkbox_label.gui"
template_node_child: false
custom_type: 0
enabled: true
}
nodes {
position {
@ -1517,10 +1431,6 @@ nodes {
alpha: 1.0
template_node_child: true
size_mode: SIZE_MODE_MANUAL
custom_type: 0
enabled: true
visible: true
material: ""
}
nodes {
position {
@ -1585,10 +1495,6 @@ nodes {
template_node_child: true
text_leading: 1.0
text_tracking: 0.0
custom_type: 0
enabled: true
visible: true
material: ""
}
material: "/builtins/materials/gui.material"
adjust_reference: ADJUST_REFERENCE_PARENT

8
main/main.gui_script
View File

@ -44,13 +44,7 @@ end
local function buy(id)
log("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)
iap.buy(id)
end
local function restore()