Skip to content

[in_app_purchase_android] Bump com.android.billingclient:billing from 5.2.0 to 6.0.0. #4390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 6 commits into from
Jul 7, 2023
Merged

[in_app_purchase_android] Bump com.android.billingclient:billing from 5.2.0 to 6.0.0. #4390

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c6e7896
supress depreaction warnings for ProrationMode and upgrade billing cl…
Jul 6, 2023
7446407
make proration_mode constant private
Jul 6, 2023
0396004
changelog and pubspec
Jul 6, 2023
b1a7ce8
format
Jul 6, 2023
ff6a817
spacing and punctuation in comments
Jul 7, 2023
e2577b2
add a word to make comment phrasing less awkward
Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
spacing and punctuation in comments
  • Loading branch information
Gray Mackall committed Jul 7, 2023
commit ff6a8179319182754deceb7dc3938a457366db2e
10 changes: 5 additions & 5 deletions ...android/android/src/main/java/io/flutter/plugins/inapppurchase/MethodCallHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ static final class MethodNames {
private MethodNames() {}
}

// TODO(gmackall) Replace uses of deprecated ProrationMode enum values with new
// TODO(gmackall): Replace uses of deprecated ProrationMode enum values with new
// ReplacementMode enum values.
// https://github.com/flutter/flutter/issues/128957
// https://github.com/flutter/flutter/issues/128957.
@SuppressWarnings(value = "deprecation")
private static final int PRORATION_MODE_UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY =
com.android.billingclient.api.BillingFlowParams.ProrationMode
Expand Down Expand Up @@ -329,16 +329,16 @@ private void launchBillingFlow(
BillingFlowParams.SubscriptionUpdateParams.newBuilder();
if (oldProduct != null && !oldProduct.isEmpty() && purchaseToken != null) {
subscriptionUpdateParamsBuilder.setOldPurchaseToken(purchaseToken);
//Set the prorationMode using a helper to minimize impact of deprecation suppression.
// Set the prorationMode using a helper to minimize impact of deprecation suppression.
setReplaceProrationMode(subscriptionUpdateParamsBuilder, prorationMode);
paramsBuilder.setSubscriptionUpdateParams(subscriptionUpdateParamsBuilder.build());
}
result.success(
fromBillingResult(billingClient.launchBillingFlow(activity, paramsBuilder.build())));
}

// TODO(gmackall): Replace uses of deprecated setReplaceProrationMode
// https://github.com/flutter/flutter/issues/128957
// TODO(gmackall): Replace uses of deprecated setReplaceProrationMode.
// https://github.com/flutter/flutter/issues/128957.
@SuppressWarnings(value = "deprecation")
private void setReplaceProrationMode(
BillingFlowParams.SubscriptionUpdateParams.Builder builder, int prorationMode) {
Expand Down
9 changes: 9 additions & 0 deletions ...android/android/src/test/java/io/flutter/plugins/inapppurchase/MethodCallHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,9 @@ public void launchBillingFlow_ok_AccountId() {
verify(result, times(1)).success(fromBillingResult(billingResult));
}

// TODO(gmackall): Replace uses of deprecated ProrationMode enum values with new
// ReplacementMode enum values.
// https://github.com/flutter/flutter/issues/128957.
@Test
@SuppressWarnings(value = "deprecation")
public void launchBillingFlow_ok_Proration() {
Expand Down Expand Up @@ -454,6 +457,9 @@ public void launchBillingFlow_ok_Proration() {
verify(result, times(1)).success(fromBillingResult(billingResult));
}

// TODO(gmackall): Replace uses of deprecated ProrationMode enum values with new
// ReplacementMode enum values.
// https://github.com/flutter/flutter/issues/128957.
@Test
@SuppressWarnings(value = "deprecation")
public void launchBillingFlow_ok_Proration_with_null_OldProduct() {
Expand Down Expand Up @@ -489,6 +495,9 @@ public void launchBillingFlow_ok_Proration_with_null_OldProduct() {
verify(result, never()).success(any());
}

// TODO(gmackall): Replace uses of deprecated ProrationMode enum values with new
// ReplacementMode enum values.
// https://github.com/flutter/flutter/issues/128957.
@Test
@SuppressWarnings(value = "deprecation")
public void launchBillingFlow_ok_Full() {
Expand Down