diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index 22c3ec56bd..a0730102d9 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -926,7 +926,7 @@ private: mo << " implementation files('libs/" << File (d).getFileName() << "')" << newLine; if (isInAppBillingEnabled()) - mo << " implementation 'com.android.billingclient:billing:5.0.0'" << newLine; + mo << " implementation 'com.android.billingclient:billing:7.0.0'" << newLine; if (areRemoteNotificationsEnabled()) { diff --git a/modules/juce_product_unlocking/native/juce_InAppPurchases_android.cpp b/modules/juce_product_unlocking/native/juce_InAppPurchases_android.cpp index b9d2addab2..60af5ac69a 100644 --- a/modules/juce_product_unlocking/native/juce_InAppPurchases_android.cpp +++ b/modules/juce_product_unlocking/native/juce_InAppPurchases_android.cpp @@ -99,9 +99,9 @@ DECLARE_JNI_CLASS (BillingFlowParamsBuilder, "com/android/billingclient/api/Bill #undef JNI_CLASS_MEMBERS #define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD, CALLBACK) \ - METHOD (build, "build", "()Lcom/android/billingclient/api/BillingFlowParams$SubscriptionUpdateParams;") \ - METHOD (setOldPurchaseToken, "setOldPurchaseToken", "(Ljava/lang/String;)Lcom/android/billingclient/api/BillingFlowParams$SubscriptionUpdateParams$Builder;") \ - METHOD (setReplaceProrationMode, "setReplaceProrationMode", "(I)Lcom/android/billingclient/api/BillingFlowParams$SubscriptionUpdateParams$Builder;") + METHOD (build, "build", "()Lcom/android/billingclient/api/BillingFlowParams$SubscriptionUpdateParams;") \ + METHOD (setOldPurchaseToken, "setOldPurchaseToken", "(Ljava/lang/String;)Lcom/android/billingclient/api/BillingFlowParams$SubscriptionUpdateParams$Builder;") \ + METHOD (setSubscriptionReplacementMode, "setSubscriptionReplacementMode", "(I)Lcom/android/billingclient/api/BillingFlowParams$SubscriptionUpdateParams$Builder;") DECLARE_JNI_CLASS (BillingFlowParamsSubscriptionUpdateParamsBuilder, "com/android/billingclient/api/BillingFlowParams$SubscriptionUpdateParams$Builder") #undef JNI_CLASS_MEMBERS @@ -856,9 +856,10 @@ private: if (! creditForUnusedSubscription) { + constexpr auto WITHOUT_PRORATION = 3; env->CallObjectMethod (subscriptionBuilder.get(), - BillingFlowParamsSubscriptionUpdateParamsBuilder.setReplaceProrationMode, - 3 /*IMMEDIATE_WITHOUT_PRORATION*/); + BillingFlowParamsSubscriptionUpdateParamsBuilder.setSubscriptionReplacementMode, + WITHOUT_PRORATION); } const LocalRef subscriptionParams { env->CallObjectMethod (subscriptionBuilder.get(),