From 0e0d03aed2907cf4df4c809ab01214245180ffca Mon Sep 17 00:00:00 2001 From: sshropshire Date: Mon, 8 Jul 2024 12:15:16 -0500 Subject: [PATCH 1/4] Bump Braintree Core version to 4.48.0. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b6d99b77..89033a0b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } - ext.brainTreeVersion = "4.45.0" + ext.brainTreeVersion = "4.48.0" ext.deps = [ "braintreeCore" : "com.braintreepayments.api:braintree-core:$brainTreeVersion", From 48df641d7df80f3d96c7929687adc657c980d37f Mon Sep 17 00:00:00 2001 From: sshropshire Date: Mon, 8 Jul 2024 12:16:34 -0500 Subject: [PATCH 2/4] Update CHANGELOG. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99154fd5..836519d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Braintree Android Drop-In Release Notes +## unreleased + +* Bump braintree_android module dependency versions to `4.48.0` + ## 6.16.0 * Bump braintree_android module dependency versions to `4.45.0` From ab1866511dc10035ea686db0fbe133b1080e1a6a Mon Sep 17 00:00:00 2001 From: sshropshire Date: Mon, 8 Jul 2024 12:51:11 -0500 Subject: [PATCH 3/4] Fix compilation error. --- .../java/com/braintreepayments/api/DropInClient.java | 11 +++++++++-- .../braintreepayments/api/DropInInternalClient.java | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Drop-In/src/main/java/com/braintreepayments/api/DropInClient.java b/Drop-In/src/main/java/com/braintreepayments/api/DropInClient.java index 92fbe631..35b0b63b 100644 --- a/Drop-In/src/main/java/com/braintreepayments/api/DropInClient.java +++ b/Drop-In/src/main/java/com/braintreepayments/api/DropInClient.java @@ -44,8 +44,15 @@ private static DropInClientParams createDefaultParams(Context context, String au customUrlScheme = dropInRequest.getCustomUrlScheme(); } - BraintreeOptions braintreeOptions = - new BraintreeOptions(context, null, customUrlScheme, authorization, clientTokenProvider, IntegrationType.DROP_IN); + BraintreeOptions braintreeOptions = new BraintreeOptions( + context, + null, + customUrlScheme, + null, + authorization, + clientTokenProvider, + IntegrationType.DROP_IN + ); BraintreeClient braintreeClient = new BraintreeClient(braintreeOptions); return new DropInClientParams() diff --git a/Drop-In/src/main/java/com/braintreepayments/api/DropInInternalClient.java b/Drop-In/src/main/java/com/braintreepayments/api/DropInInternalClient.java index e6a79e83..bcad2bff 100644 --- a/Drop-In/src/main/java/com/braintreepayments/api/DropInInternalClient.java +++ b/Drop-In/src/main/java/com/braintreepayments/api/DropInInternalClient.java @@ -40,8 +40,15 @@ class DropInInternalClient { private static DropInInternalClientParams createDefaultParams(Context context, String authorization, DropInRequest dropInRequest, String sessionId) { String customUrlScheme = dropInRequest.getCustomUrlScheme(); - BraintreeOptions braintreeOptions = - new BraintreeOptions(context, sessionId, customUrlScheme, authorization, null, IntegrationType.DROP_IN); + BraintreeOptions braintreeOptions = new BraintreeOptions( + context, + sessionId, + customUrlScheme, + null, + authorization, + null, + IntegrationType.DROP_IN + ); BraintreeClient braintreeClient = new BraintreeClient(braintreeOptions); From 08f83c8045a9f4682295e5886d2914f058ccd890 Mon Sep 17 00:00:00 2001 From: sshropshire Date: Mon, 8 Jul 2024 13:04:05 -0500 Subject: [PATCH 4/4] Fix broken unit tests. --- .../java/com/braintreepayments/api/DropInActivityUnitTest.kt | 2 +- .../com/braintreepayments/api/DropInInternalClientUnitTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Drop-In/src/test/java/com/braintreepayments/api/DropInActivityUnitTest.kt b/Drop-In/src/test/java/com/braintreepayments/api/DropInActivityUnitTest.kt index f5ac588a..53adfb60 100644 --- a/Drop-In/src/test/java/com/braintreepayments/api/DropInActivityUnitTest.kt +++ b/Drop-In/src/test/java/com/braintreepayments/api/DropInActivityUnitTest.kt @@ -1200,7 +1200,7 @@ class DropInActivityUnitTest { val metadata = JSONObject() val returnUrlScheme = "sample-scheme" val browserSwitchRequest = - BrowserSwitchRequest(requestCode, url, metadata, returnUrlScheme, true) + BrowserSwitchRequest(requestCode, url, metadata, returnUrlScheme, null, true) return BrowserSwitchResult(BrowserSwitchStatus.SUCCESS, browserSwitchRequest) } diff --git a/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java index 7cec8598..119cc5e8 100644 --- a/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java +++ b/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java @@ -1591,7 +1591,7 @@ private static BrowserSwitchResult createSuccessfulBrowserSwitchResult() { Uri url = Uri.parse("www.example.com"); String returnUrlScheme = "sample-scheme"; BrowserSwitchRequest browserSwitchRequest = new BrowserSwitchRequest( - requestCode, url, new JSONObject(), returnUrlScheme, true); + requestCode, url, new JSONObject(), returnUrlScheme, null, true); return new BrowserSwitchResult(BrowserSwitchStatus.SUCCESS, browserSwitchRequest); } } \ No newline at end of file