Upgrade leakcanary and downgrade to mockito-core

Author: akalichety-hw

build.gradle

@@ -89,8 +89,8 @@ subprojects {
         testRulesVersion = '1.2.0'
         espressoVersion = '3.4.0'
         mockServerVersion = '3.11.0'
-        leakcanaryVersion = '2.8.1'
-        mockitoVersion = '5.15.2'
+        leakcanaryVersion = '2.14'
+        mockitoVersion = '4.11.0'
         junitParamsVersion = '1.1.1'
         robolectricVersion = '4.14.1'
         coreTest = '1.6.1'

gradle.properties

@@ -4,4 +4,4 @@ android.jetifier.ignorelist=bcprov-jdk18on-1.78.1.jar
 sonatypeUsername=
 sonatypePassword=
 android.disableAutomaticComponentCreation=true
-
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m

receiptui/build.gradle

@@ -32,6 +32,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockServerVersion"
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanaryVersion"
+    androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion"
     androidTestImplementation project(':testutils')
 }
 tasks.withType(Test) {

receiptui/src/androidTest/java/com/hyperwallet/android/ui/receipt/HyperwalletInstrumentedTestApplication.java

@@ -3,16 +3,18 @@
 
 import android.app.Application;
 
-import com.squareup.leakcanary.InstrumentationLeakDetector;
-import com.squareup.leakcanary.LeakCanary;
+import java.util.Objects;
+
+import leakcanary.AppWatcher;
+import leakcanary.LeakCanary;
 
 public class HyperwalletInstrumentedTestApplication extends Application {
 
     @Override
     public void onCreate() {
 
         super.onCreate();
-        if (LeakCanary.isInAnalyzerProcess(this)) {
+        if (Objects.isNull(LeakCanary.getConfig())) {
             // This process is dedicated to LeakCanary for heap analysis.
             // You should not init your app in this process.
             return;
@@ -22,10 +24,7 @@ public void onCreate() {
 
 
     protected void installLeakCanary() {
-
-        InstrumentationLeakDetector.instrumentationRefWatcher(this)
-                .buildAndInstall();
-
+        AppWatcher.INSTANCE.manualInstall(this);
     }
 
 }

transfermethodui/build.gradle

@@ -33,6 +33,8 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockServerVersion"
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanaryVersion"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanaryVersion"
+    androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion"
     androidTestImplementation "org.mockito:mockito-android:$mockitoVersion"
     androidTestImplementation project(":testutils")
 

transfermethodui/src/androidTest/java/com/hyperwallet/android/ui/transfermethod/HyperwalletInstrumentedTestApplication.java

@@ -3,16 +3,18 @@
 
 import android.app.Application;
 
-import com.squareup.leakcanary.InstrumentationLeakDetector;
-import com.squareup.leakcanary.LeakCanary;
+import java.util.Objects;
+
+import leakcanary.AppWatcher;
+import leakcanary.LeakCanary;
 
 public class HyperwalletInstrumentedTestApplication extends Application {
 
     @Override
     public void onCreate() {
 
         super.onCreate();
-        if (LeakCanary.isInAnalyzerProcess(this)) {
+        if (Objects.isNull(LeakCanary.getConfig())) {
             // This process is dedicated to LeakCanary for heap analysis.
             // You should not init your app in this process.
             return;
@@ -22,10 +24,7 @@ public void onCreate() {
 
 
     protected void installLeakCanary() {
-
-        InstrumentationLeakDetector.instrumentationRefWatcher(this)
-                .buildAndInstall();
-
+        AppWatcher.INSTANCE.manualInstall(this);
     }
 
 }

transferui/build.gradle

@@ -25,6 +25,7 @@ dependencies {
     androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"
     androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockServerVersion"
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanaryVersion"
+    androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leakcanaryVersion"
     androidTestImplementation project(":testutils")
     androidTestImplementation project(":transfermethodui")
 

transferui/src/androidTest/java/com/hyperwallet/android/ui/transfer/HyperwalletInstrumentedTestApplication.java

@@ -3,16 +3,18 @@
 
 import android.app.Application;
 
-import com.squareup.leakcanary.InstrumentationLeakDetector;
-import com.squareup.leakcanary.LeakCanary;
+import java.util.Objects;
+
+import leakcanary.AppWatcher;
+import leakcanary.LeakCanary;
 
 public class HyperwalletInstrumentedTestApplication extends Application {
 
     @Override
     public void onCreate() {
 
         super.onCreate();
-        if (LeakCanary.isInAnalyzerProcess(this)) {
+        if (Objects.isNull(LeakCanary.getConfig())) {
             // This process is dedicated to LeakCanary for heap analysis.
             // You should not init your app in this process.
             return;
@@ -22,10 +24,6 @@ public void onCreate() {
 
 
     protected void installLeakCanary() {
-
-        InstrumentationLeakDetector.instrumentationRefWatcher(this)
-                .buildAndInstall();
-
+        AppWatcher.INSTANCE.manualInstall(this);
     }
-
 }