Bump Braintree Version to 4.31.0 (#422)

* Bump Braintree version to 4.27.1. * Update CHANGELOG. * Remove unused imports. * Fix broken mockito imports. * Update braintree_android to version 4.27.2. * Update braintree_android to version 4.31.0. * Update CHANGELOG. * Bump Kotlin version. * Update GooglePay tests to include bin data.
braintree · Jun 13, 2023 · 47bc858 · 47bc858
1 parent ba342f0
commit 47bc858
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 43 deletions.
diff --git 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.31.0`
+
 ## 6.9.0
 
 * Prevent Google Pay from launching twice when double tapped

diff --git a/Drop-In/build.gradle b/Drop-In/build.gradle
@@ -103,13 +103,14 @@ dependencies {
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'androidx.work:work-testing:2.5.0'
     testImplementation 'io.mockk:mockk:1.12.0'
-    testImplementation 'org.mockito:mockito-core:3.6.0'
+    testImplementation 'org.mockito:mockito-core:5.2.0'
 
     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 'org.mockito:mockito-core:5.2.0'
 }
 
 // region signing and publishing

diff --git a/Drop-In/src/main/java/com/braintreepayments/api/DropInRequest.java b/Drop-In/src/main/java/com/braintreepayments/api/DropInRequest.java
@@ -1,15 +1,12 @@
 package com.braintreepayments.api;
 
-import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 
 import androidx.annotation.Nullable;
 
 import com.braintreepayments.cardform.view.CardForm;
 
-import java.io.Serializable;
-
 /**
  * Used to start {@link DropInActivity} with specified options.
  */

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/Fixtures.kt b/Drop-In/src/sharedTest/java/com/braintreepayments/api/Fixtures.kt
@@ -472,7 +472,7 @@ object Fixtures {
             "description": "Visa •••• 1234",
             "tokenizationData": {
               "type": "PAYMENT_GATEWAY",
-              "token": "{\"androidPayCards\":[{\"type\":\"AndroidPayCard\",\"nonce\":\"d887f42c-bda5-091a-0798-af42d3ed173e\",\"description\":\"Android Pay\",\"consumed\":false,\"details\":{\"cardType\":\"Visa\",\"lastTwo\":\"34\",\"lastFour\":\"1234\",\"isNetworkTokenized\":true},\"binData\":{\"prepaid\":\"No\",\"healthcare\":\"No\",\"debit\":\"No\",\"durbinRegulated\":\"No\",\"commercial\":\"No\",\"payroll\":\"No\",\"issuingBank\":\"Issuing Bank USA\",\"countryOfIssuance\":\"USA\",\"productId\":\"A\"}}]}"
+              "token": "{\"androidPayCards\":[{\"type\":\"AndroidPayCard\",\"nonce\":\"d887f42c-bda5-091a-0798-af42d3ed173e\",\"description\":\"Android Pay\",\"consumed\":false,\"details\":{\"cardType\":\"Visa\",\"bin\":\"123456\",\"lastTwo\":\"34\",\"lastFour\":\"1234\",\"isNetworkTokenized\":true},\"binData\":{\"prepaid\":\"No\",\"healthcare\":\"No\",\"debit\":\"No\",\"durbinRegulated\":\"No\",\"commercial\":\"No\",\"payroll\":\"No\",\"issuingBank\":\"Issuing Bank USA\",\"countryOfIssuance\":\"USA\",\"productId\":\"A\"}}]}"
             },
             "type": "CARD",
             "info": {
@@ -492,7 +492,7 @@ object Fixtures {
             "description": "Visa •••• 1234",
             "tokenizationData": {
               "type": "PAYMENT_GATEWAY",
-              "token": "{\"androidPayCards\":[{\"type\":\"AndroidPayCard\",\"nonce\":\"d887f42c-bda5-091a-0798-af42d3ed173e\",\"description\":\"Android Pay\",\"consumed\":false,\"details\":{\"cardType\":\"Visa\",\"lastTwo\":\"34\",\"lastFour\":\"1234\",\"isNetworkTokenized\":false},\"binData\":{\"prepaid\":\"No\",\"healthcare\":\"No\",\"debit\":\"No\",\"durbinRegulated\":\"No\",\"commercial\":\"No\",\"payroll\":\"No\",\"issuingBank\":\"Issuing Bank USA\",\"countryOfIssuance\":\"USA\",\"productId\":\"A\"}}]}"
+              "token": "{\"androidPayCards\":[{\"type\":\"AndroidPayCard\",\"nonce\":\"d887f42c-bda5-091a-0798-af42d3ed173e\",\"description\":\"Android Pay\",\"consumed\":false,\"details\":{\"cardType\":\"Visa\",\"bin\":\"123456\",\"lastTwo\":\"34\",\"lastFour\":\"1234\",\"isNetworkTokenized\":false},\"binData\":{\"prepaid\":\"No\",\"healthcare\":\"No\",\"debit\":\"No\",\"durbinRegulated\":\"No\",\"commercial\":\"No\",\"payroll\":\"No\",\"issuingBank\":\"Issuing Bank USA\",\"countryOfIssuance\":\"USA\",\"productId\":\"A\"}}]}"
             },
             "type": "CARD",
             "info": {

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockBraintreeClientBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockBraintreeClientBuilder.java
@@ -1,7 +1,7 @@
 package com.braintreepayments.api;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockDataCollectorBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockDataCollectorBuilder.java
@@ -1,6 +1,6 @@
 package com.braintreepayments.api;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockDropInInternalClientBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockDropInInternalClientBuilder.java
@@ -1,7 +1,7 @@
 package com.braintreepayments.api;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockGooglePayClientBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockGooglePayClientBuilder.java
@@ -1,7 +1,7 @@
 package com.braintreepayments.api;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockPayPalClientBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockPayPalClientBuilder.java
@@ -1,6 +1,6 @@
 package com.braintreepayments.api;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockPaymentMethodClientBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockPaymentMethodClientBuilder.java
@@ -1,6 +1,6 @@
 package com.braintreepayments.api;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockThreeDSecureClientBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockThreeDSecureClientBuilder.java
@@ -1,7 +1,7 @@
 package com.braintreepayments.api;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 

diff --git a/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockVenmoClientBuilder.java b/Drop-In/src/sharedTest/java/com/braintreepayments/api/MockVenmoClientBuilder.java
@@ -1,7 +1,7 @@
 package com.braintreepayments.api;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

diff --git a/Drop-In/src/test/java/com/braintreepayments/api/DropInClientUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/DropInClientUnitTest.java
@@ -4,11 +4,11 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Intent;
@@ -412,7 +412,7 @@ public void onDropInResult_whenResultIsNull_doesNothing() {
         sut.setListener(listener);
 
         sut.onDropInResult(null);
-        verifyZeroInteractions(listener);
+        verifyNoInteractions(listener);
     }
 
     @Test

diff --git a/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/DropInInternalClientUnitTest.java
@@ -4,10 +4,10 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

diff --git a/Drop-In/src/test/java/com/braintreepayments/api/DropInSharedPreferencesUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/DropInSharedPreferencesUnitTest.java
@@ -4,7 +4,7 @@
 import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -67,6 +67,6 @@ public void setLastUsedPaymentMethod_whenPaymentMethodDoesNotExist_doesNotSetPay
         when(paymentMethodInspector.getPaymentMethod(nonce)).thenReturn(null);
 
         sut.setLastUsedPaymentMethod(nonce);
-        verifyZeroInteractions(braintreeSharedPreferences);
+        verifyNoInteractions(braintreeSharedPreferences);
     }
 }
diff --git a/Drop-In/src/test/java/com/braintreepayments/api/PaymentMethodClientUnitTest.java b/Drop-In/src/test/java/com/braintreepayments/api/PaymentMethodClientUnitTest.java
@@ -1,6 +1,17 @@
 package com.braintreepayments.api;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 
 import androidx.test.core.app.ApplicationProvider;
@@ -16,17 +27,6 @@
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(RobolectricTestRunner.class)
 public class PaymentMethodClientUnitTest {
 

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         maven {
             url = "https://plugins.gradle.org/m2/"
         }
     }
 
-    ext.brainTreeVersion = "4.27.0"
+    ext.brainTreeVersion = "4.31.0"
 
     ext.deps = [
             "braintreeCore" : "com.braintreepayments.api:braintree-core:$brainTreeVersion",
@@ -46,7 +46,6 @@ ext {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
 }