wip: clean up

muzahidul-opti · muzahidul-opti · commit 0d44548ef891 · 2024-12-12T18:40:03.000+06:00
diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
@@ -85,11 +85,10 @@ dependencies {
     implementation "androidx.annotation:annotation:$annotations_ver"
 
     testImplementation "junit:junit:$junit_ver"
-    testImplementation "org.mockito:mockito-core:3.6.28"
+    testImplementation "org.mockito:mockito-core:$mockito_ver_sdk_module"
 
     testImplementation "org.powermock:powermock-module-junit4:$powermock_ver"
     testImplementation "org.powermock:powermock-api-mockito2:$powermock_ver"
-//    testImplementation "org.powermock:powermock-core:$powermock_ver"
     testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
 
     androidTestImplementation "androidx.work:work-testing:$work_runtime"
@@ -102,9 +101,6 @@ dependencies {
 
     androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
     androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.google.code.gson:gson:$gson_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
diff --git a/build.gradle b/build.gradle
@@ -77,10 +77,7 @@ ext {
     annotations_ver = "1.2.0"
     junit_ver = "4.12"
     mockito_ver = "4.11.0"
-//    mockito_ver = "4.9.0"
-//    mockito_ver = "2.8.9"
-//    mockito_ver = " 2.1.0"
-//    mockito_ver = "1.10.19"
+    mockito_ver_sdk_module = "3.6.28"
     powermock_ver = "2.0.9"
     support_test_runner_ver = "0.5"
     dexmaker_ver = "1.4"
diff --git a/datafile-handler/build.gradle b/datafile-handler/build.gradle
@@ -65,9 +65,6 @@ dependencies {
 
     androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
     androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/event-handler/build.gradle b/event-handler/build.gradle
@@ -60,8 +60,6 @@ dependencies {
     testImplementation "junit:junit:$junit_ver"
     testImplementation "org.mockito:mockito-core:$mockito_ver"
     testImplementation "org.mockito:mockito-inline:$mockito_ver"
-//    testImplementation "org.powermock:powermock-module-junit4:$powermock_ver"
-//    testImplementation "org.powermock:powermock-api-mockito2:$powermock_ver"
     testImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
 
     androidTestImplementation "androidx.work:work-testing:$work_runtime"
@@ -74,9 +72,6 @@ dependencies {
 
     androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
     androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/odp/build.gradle b/odp/build.gradle
@@ -60,7 +60,6 @@ dependencies {
 
     testImplementation "junit:junit:$junit_ver"
     testImplementation "org.mockito:mockito-core:$mockito_ver"
-//    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockito_ver"
 
     compileOnly "com.noveogroup.android:android-logger:$android_logger_ver"
 
@@ -75,7 +74,4 @@ dependencies {
 
     androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
     androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
 }
diff --git a/shared/build.gradle b/shared/build.gradle
@@ -76,9 +76,6 @@ dependencies {
 
     androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
     androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
 }
diff --git a/user-profile/build.gradle b/user-profile/build.gradle
@@ -66,9 +66,6 @@ dependencies {
 
     androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
     androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"
-//    androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
 }

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,6 @@ dependencies {`
`76`	`76`
`77`	`77`	`androidTestImplementation "org.mockito:mockito-core:$mockito_ver"`
`78`	`78`	`androidTestImplementation "org.mockito:mockito-android:$mockito_ver"`
`79`		`-// androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"`
`80`		`-// androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"`
`81`		`-// androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"`
`82`	`79`	`androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"`
`83`	`80`	`androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"`
`84`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,6 @@ dependencies {`
`66`	`66`
`67`	`67`	`androidTestImplementation "org.mockito:mockito-core:$mockito_ver"`
`68`	`68`	`androidTestImplementation "org.mockito:mockito-android:$mockito_ver"`
`69`		`-// androidTestImplementation "com.crittercism.dexmaker:dexmaker:$dexmaker_ver"`
`70`		`-// androidTestImplementation "com.crittercism.dexmaker:dexmaker-dx:$dexmaker_ver"`
`71`		`-// androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"`
`72`	`69`	`androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"`
`73`	`70`	`androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"`
`74`	`71`	`}`