From 3c91f36ff9791b7c1698200c86ebbc00b4753fab Mon Sep 17 00:00:00 2001 From: yusufdag Date: Thu, 24 Jun 2021 13:59:57 +0200 Subject: [PATCH 1/2] Update the version number and CHANGELOG --- packages/in_app_purchase/in_app_purchase/CHANGELOG.md | 5 +++++ packages/in_app_purchase/in_app_purchase/pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/in_app_purchase/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase/CHANGELOG.md index 52bbff52bef0..156751a8d526 100644 --- a/packages/in_app_purchase/in_app_purchase/CHANGELOG.md +++ b/packages/in_app_purchase/in_app_purchase/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.0.0 + +* BREAKING CHANGE : Refactor to handle new `PurchaseStatus` named `canceled`. This means developers + can distinguish between an error and user cancellation. + ## 1.0.6 * Added import flutter foundation dependency in README.md to be able to use `defaultTargetPlatform`. diff --git a/packages/in_app_purchase/in_app_purchase/pubspec.yaml b/packages/in_app_purchase/in_app_purchase/pubspec.yaml index b589c24d3677..637e112ab872 100644 --- a/packages/in_app_purchase/in_app_purchase/pubspec.yaml +++ b/packages/in_app_purchase/in_app_purchase/pubspec.yaml @@ -2,7 +2,7 @@ name: in_app_purchase description: A Flutter plugin for in-app purchases. Exposes APIs for making in-app purchases through the App Store and Google Play. repository: https://github.com/flutter/plugins/tree/master/packages/in_app_purchase issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22 -version: 1.0.6 +version: 2.0.0 environment: sdk: ">=2.12.0 <3.0.0" From 2a7ae9fee997b58ca539e1ca827a29199f859dfb Mon Sep 17 00:00:00 2001 From: Maurits van Beusekom Date: Wed, 1 Dec 2021 08:51:57 +0100 Subject: [PATCH 2/2] Fixes analysis warnings --- packages/in_app_purchase/in_app_purchase/CHANGELOG.md | 10 +++++----- .../example/integration_test/in_app_purchase_test.dart | 7 ------- .../in_app_purchase/example/lib/main.dart | 8 -------- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/packages/in_app_purchase/in_app_purchase/CHANGELOG.md b/packages/in_app_purchase/in_app_purchase/CHANGELOG.md index 5cc6407a8a5b..9e82ebdfe7a8 100644 --- a/packages/in_app_purchase/in_app_purchase/CHANGELOG.md +++ b/packages/in_app_purchase/in_app_purchase/CHANGELOG.md @@ -1,10 +1,5 @@ ## 2.0.0 -* Fixes integration tests. -* Updates example app Android compileSdkVersion to 31. -* Deprecates the `InAppPurchaseAndroidPlatformAddition.enablePendingPurchases()` method and `InAppPurchaseAndroidPlatformAddition.enablePendingPurchase` property. -* Adds support for promotional offers on the store_kit_wrappers Dart API. - * **BREAKING CHANGES**: * Adds a new `PurchaseStatus` named `canceled`. This means developers can distinguish between an error and user cancellation. * Updates `restorePurchases` to emit an empty list of purchases on StoreKit when there are no purchases to restore (same as Android). @@ -13,6 +8,11 @@ * Renames `InAppPurchaseIosPlatformAddition` to `InAppPurchaseStoreKitPlatformAddition`. +* Deprecates the `InAppPurchaseAndroidPlatformAddition.enablePendingPurchases()` method and `InAppPurchaseAndroidPlatformAddition.enablePendingPurchase` property. +* Adds support for promotional offers on the store_kit_wrappers Dart API. +* Fixes integration tests. +* Updates example app Android compileSdkVersion to 31. + ## 1.0.9 * Handle purchases with `PurchaseStatus.restored` correctly in the example App. diff --git a/packages/in_app_purchase/in_app_purchase/example/integration_test/in_app_purchase_test.dart b/packages/in_app_purchase/in_app_purchase/example/integration_test/in_app_purchase_test.dart index 55ad1223f548..437ee99e9f36 100644 --- a/packages/in_app_purchase/in_app_purchase/example/integration_test/in_app_purchase_test.dart +++ b/packages/in_app_purchase/in_app_purchase/example/integration_test/in_app_purchase_test.dart @@ -2,21 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:io'; - import 'package:flutter_test/flutter_test.dart'; import 'package:in_app_purchase/in_app_purchase.dart'; -import 'package:in_app_purchase_android/in_app_purchase_android.dart'; import 'package:integration_test/integration_test.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); testWidgets('Can create InAppPurchase instance', (WidgetTester tester) async { - if (Platform.isAndroid) { - // https://github.com/flutter/flutter/issues/93837 - InAppPurchaseAndroidPlatformAddition.enablePendingPurchases(); - } final InAppPurchase iapInstance = InAppPurchase.instance; expect(iapInstance, isNotNull); }); diff --git a/packages/in_app_purchase/in_app_purchase/example/lib/main.dart b/packages/in_app_purchase/in_app_purchase/example/lib/main.dart index 0bdcfc3f1b63..5d2f04ce8ff0 100644 --- a/packages/in_app_purchase/in_app_purchase/example/lib/main.dart +++ b/packages/in_app_purchase/in_app_purchase/example/lib/main.dart @@ -4,7 +4,6 @@ import 'dart:async'; import 'dart:io'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:in_app_purchase/in_app_purchase.dart'; import 'package:in_app_purchase_android/billing_client_wrappers.dart'; @@ -16,13 +15,6 @@ import 'consumable_store.dart'; void main() { WidgetsFlutterBinding.ensureInitialized(); - if (defaultTargetPlatform == TargetPlatform.android) { - // For play billing library 2.0 on Android, it is mandatory to call - // [enablePendingPurchases](https://developer.android.com/reference/com/android/billingclient/api/BillingClient.Builder.html#enablependingpurchases) - // as part of initializing the app. - InAppPurchaseAndroidPlatformAddition.enablePendingPurchases(); - } - runApp(_MyApp()); }