diff --git a/WordPressUtils/build.gradle b/WordPressUtils/build.gradle index b97be05f2..1d6ed63c8 100644 --- a/WordPressUtils/build.gradle +++ b/WordPressUtils/build.gradle @@ -12,13 +12,12 @@ repositories { dependencies { implementation "org.apache.commons:commons-text:$commonsTextVersion" - implementation "com.android.volley:volley:$volleyVersion" implementation "com.google.android.material:material:$materialVersion" implementation "androidx.swiperefreshlayout:swiperefreshlayout:$androidxSwipeRefreshLayoutVersion" implementation "androidx.recyclerview:recyclerview:$androidxRecyclerViewVersion" - implementation "org.greenrobot:eventbus:$eventBusVersion" + implementation "org.greenrobot:eventbus-java:$eventBusVersion" - implementation "androidx.core:core-ktx:$androidxCoreVersion" + implementation "androidx.core:core:$androidxCoreVersion" testImplementation "junit:junit:$junitVersion" testImplementation "org.assertj:assertj-core:$assertjVersion" @@ -28,8 +27,6 @@ dependencies { lintChecks "org.wordpress:lint:$wordpressLintVersion" androidTestImplementation "androidx.test:runner:$androidxTestCoreVersion" - androidTestImplementation "androidx.test:rules:$androidxTestCoreVersion" - androidTestImplementation "androidx.test.ext:junit:$jUnitExtVersion" } android { diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java b/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java index f8f843862..c331b80ac 100644 --- a/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java +++ b/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java @@ -205,18 +205,18 @@ public static void e(T tag, Throwable tr) { * Sends a ERROR log message * @param tag Used to identify the source of a log message. It usually identifies the class or activity where the * log call occurs. - * @param volleyErrorMsg + * @param errorMsg * @param statusCode */ - public static void e(T tag, String volleyErrorMsg, int statusCode) { - if (TextUtils.isEmpty(volleyErrorMsg)) { + public static void e(T tag, String errorMsg, int statusCode) { + if (TextUtils.isEmpty(errorMsg)) { return; } String logText; if (statusCode == -1) { - logText = volleyErrorMsg; + logText = errorMsg; } else { - logText = volleyErrorMsg + ", status " + statusCode; + logText = errorMsg + ", status " + statusCode; } Log.e(TAG + "-" + tag.toString(), logText); addEntry(tag, LogLevel.w, logText); diff --git a/build.gradle b/build.gradle index 4aa42004d..2cd8779e9 100644 --- a/build.gradle +++ b/build.gradle @@ -46,14 +46,10 @@ ext { commonsTextVersion = '1.10.0' eventBusVersion = '3.3.1' materialVersion = '1.2.1' - volleyVersion = '1.2.0' // test androidxTestCoreVersion = '1.4.0' assertjVersion = '3.11.1' junitVersion = '4.12' robolectricVersion = '4.9' - - // android test - jUnitExtVersion = '1.1.3' } diff --git a/settings.gradle b/settings.gradle index d2d48423c..86c086e56 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ pluginManagement { gradle.ext.kotlinVersion = '1.9.24' gradle.ext.agpVersion = '8.1.0' gradle.ext.automatticPublishToS3Version = '0.9.0' - gradle.ext.dependencyAnalysisVersion = '1.28.0' + gradle.ext.dependencyAnalysisVersion = '1.33.0' plugins { id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion