diff --git a/CHANGELOG.md b/CHANGELOG.md index 836519d4..01f0b68b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## unreleased -* Bump braintree_android module dependency versions to `4.48.0` +* Bump braintree_android module dependency versions to `4.49.1` ## 6.16.0 diff --git a/Drop-In/build.gradle b/Drop-In/build.gradle index e6ba38e0..807c647f 100644 --- a/Drop-In/build.gradle +++ b/Drop-In/build.gradle @@ -65,8 +65,8 @@ android { dependencies { // TODO: consider making this api in core to allow for PaymentType and other @IntDef / @StringDef constants to work for merchants implementation 'androidx.annotation:annotation:1.1.0' - implementation 'androidx.fragment:fragment:1.4.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' + implementation 'androidx.fragment:fragment:1.7.1' + implementation 'androidx.lifecycle:lifecycle-runtime:2.7.0' api deps.braintreeCore api deps.threeDSecure @@ -102,8 +102,8 @@ dependencies { androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.fragment:fragment-testing:1.3.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + androidTestImplementation 'androidx.fragment:fragment-testing:1.7.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' androidTestImplementation 'org.mockito:mockito-core:5.2.0' } diff --git a/Drop-In/src/main/java/com/braintreepayments/api/PaymentMethodClient.java b/Drop-In/src/main/java/com/braintreepayments/api/PaymentMethodClient.java index 758a3497..355f4df0 100644 --- a/Drop-In/src/main/java/com/braintreepayments/api/PaymentMethodClient.java +++ b/Drop-In/src/main/java/com/braintreepayments/api/PaymentMethodClient.java @@ -152,7 +152,7 @@ public void onAuthorizationResult(@Nullable Authorization authorization, @Nullab callback.onResult(null, graphQLError); } - braintreeClient.sendGraphQLPOST(base.toString(), (responseBody, httpError) -> { + braintreeClient.sendGraphQLPOST(base, (responseBody, httpError) -> { if (responseBody != null) { callback.onResult(paymentMethodNonce, null); braintreeClient.sendAnalyticsEvent("delete-payment-methods.succeeded"); diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockBraintreeClientBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockBraintreeClientBuilder.java index 938b7eac..9ba50440 100644 --- a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockBraintreeClientBuilder.java +++ b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockBraintreeClientBuilder.java @@ -118,7 +118,7 @@ public BraintreeClient build() { callback.onResult(null, sendGraphQLPOSTError); } return null; - }).when(braintreeClient).sendGraphQLPOST(anyString(), any(HttpResponseCallback.class)); + }).when(braintreeClient).sendGraphQLPOST(any(), any(HttpResponseCallback.class)); return braintreeClient; } diff --git a/Drop-In/src/test/java/com/braintreepayments/api/PaymentMethodClientUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/PaymentMethodClientUnitTest.java index 5c80ce75..7a2ba2b7 100644 --- a/Drop-In/src/test/java/com/braintreepayments/api/PaymentMethodClientUnitTest.java +++ b/Drop-In/src/test/java/com/braintreepayments/api/PaymentMethodClientUnitTest.java @@ -291,7 +291,7 @@ public void deletePaymentMethodNonce_withTokenizationKey_throwsAnError() { assertEquals("A client token with a customer id must be used to delete a payment method nonce.", captor.getValue().getMessage()); - verify(braintreeClient, never()).sendGraphQLPOST(anyString(), any(HttpResponseCallback.class)); + verify(braintreeClient, never()).sendGraphQLPOST(any(), any(HttpResponseCallback.class)); } @Test @@ -374,10 +374,10 @@ public void deletePaymentMethodNonce_postToGraphQL() verify(braintreeClient).getIntegrationType(); - ArgumentCaptor captor = ArgumentCaptor.forClass(String.class); + ArgumentCaptor captor = ArgumentCaptor.forClass(JSONObject.class); verify(braintreeClient).sendGraphQLPOST(captor.capture(), any(HttpResponseCallback.class)); - JSONObject graphQlRequest = new JSONObject(captor.getValue()); + JSONObject graphQlRequest = captor.getValue(); String expectedGraphQLQuery = GraphQLQueryHelper.getQuery( ApplicationProvider.getApplicationContext(), R.raw.delete_payment_method_mutation); diff --git a/build.gradle b/build.gradle index 89033a0b..180582cb 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } - ext.brainTreeVersion = "4.48.0" + ext.brainTreeVersion = "4.49.1" ext.deps = [ "braintreeCore" : "com.braintreepayments.api:braintree-core:$brainTreeVersion",