Skip to content

update braintree_android dep #497

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
merged 5 commits into from
Apr 21, 2025
Merged

update braintree_android dep #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
036040d
update braintree_android dep
saperi22 Apr 18, 2025
30fae9b
update sdk target to 35
saperi22 Apr 18, 2025
fc113c8
hardcode constant that was removed in the dependency
saperi22 Apr 18, 2025
2483e0d
Fix test.
saperi22 Apr 18, 2025
24563da
update activity xml
saperi22 Apr 18, 2025
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## unreleased

* Bump braintree_android module dependency versions to `4.49.1`
* Bump braintree_android module dependency versions to `4.50.0`

## 6.16.0

Expand Down
1 change: 1 addition & 0 deletions Demo/src/main/res/layout/create_transaction_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:gravity="center">

<ProgressBar
Expand Down
1 change: 1 addition & 0 deletions Demo/src/main/res/layout/main_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:fitsSystemWindows="true"
android:padding="10dp">

<LinearLayout
Expand Down
2 changes: 1 addition & 1 deletion Drop-In/src/main/java/com/braintreepayments/api/PaymentMethodClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public void onAuthorizationResult(@Nullable Authorization authorization, @Nullab
input.put(SINGLE_USE_TOKEN_ID, paymentMethodNonce.getString());
variables.put(INPUT, input);
base.put(VARIABLES, variables);
base.put(GraphQLConstants.Keys.OPERATION_NAME,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like GraphQLConstants.Keys.OPERATION_NAME constant was removed from the braintree_android sdk that was missed during 4.50.0 publish. As it is only a constant, it is being hardcoded here.

base.put("operationName",
"DeletePaymentMethodFromSingleUseToken");
} catch (Resources.NotFoundException | IOException | JSONException e) {
Exception graphQLError = new BraintreeException("Unable to read GraphQL query");
Expand Down
1 change: 1 addition & 0 deletions Drop-In/src/main/res/layout/bt_drop_in_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">

<androidx.fragment.app.FragmentContainerView
Expand Down
2 changes: 1 addition & 1 deletion Drop-In/src/test/java/com/braintreepayments/api/PaymentMethodClientUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ public void deletePaymentMethodNonce_postToGraphQL()
.getJSONObject("input").getString("singleUseTokenId"));

assertEquals("DeletePaymentMethodFromSingleUseToken", graphQlRequest
.getString(GraphQLConstants.Keys.OPERATION_NAME));
.getString("operationName"));

assertEquals("test-integration", metadata.getString("integration"));
assertEquals("test-session-id", metadata.getString("sessionId"));
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}

ext.brainTreeVersion = "4.49.1"
ext.brainTreeVersion = "4.50.0"

ext.deps = [
"braintreeCore" : "com.braintreepayments.api:braintree-core:$brainTreeVersion",
Expand Down Expand Up @@ -42,7 +42,7 @@ group "com.braintreepayments"
ext {
compileSdkVersion = 34
minSdkVersion = 21
targetSdkVersion = 34
targetSdkVersion = 35
versionCode = 109
versionName = version
}
Expand Down