From 1da4c42220e88b54211ab891efbb2c5bf20477f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 18:50:19 +0000 Subject: fix(deps): update dependency com.hierynomus:sshj to v0.36.0 (#2670) * fix(deps): update dependency com.hierynomus:sshj to v0.36.0 * refactor(build): drop unnecessary explicit dependency * chore(idea): cruft * fix(app): ensure SLF4J v1 is used * fix(build): disable illegal BindsCanBeExtensionFunction lint * chore: refresh Lint baselines --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Harsh Shandilya --- app/build.gradle.kts | 7 +++++-- app/lint-baseline.xml | 8 ++++---- app/proguard-rules.pro | 1 - 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4f825aad..9a469213 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -86,9 +86,8 @@ dependencies { implementation(libs.thirdparty.logcat) implementation(libs.thirdparty.modernAndroidPrefs) implementation(libs.thirdparty.plumber) - implementation(libs.thirdparty.sshj) { exclude(group = "org.bouncycastle") } + implementation(libs.thirdparty.sshj) implementation(libs.thirdparty.bouncycastle.bcprov) - implementation(libs.thirdparty.bouncycastle.bcpkix) if (snapshot.snapshot) { implementation(libs.thirdparty.whatthestack) @@ -96,6 +95,10 @@ dependencies { debugImplementation(libs.thirdparty.whatthestack) } + implementation(libs.thirdparty.slf4j.api) { + because("SSHJ now uses SLF4J 2.0 which we don't want") + } + implementation(libs.thirdparty.leakcanary.core) nonFreeImplementation(libs.thirdparty.nonfree.googlePlayAuthApiPhone) nonFreeImplementation(libs.thirdparty.nonfree.sentry) diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index 8450381e..137d61d6 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -14,16 +14,16 @@ + message="Invalid package reference in library; not included in Android: `javax.naming.directory`. Referenced from `org.bouncycastle.cert.dane.fetcher.JndiDANEFetcherFactory`."> + file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.75/5adfef8a71a0933454739264b56283cc73dd2383/bcpkix-jdk18on-1.75.jar"/> + message="Invalid package reference in library; not included in Android: `javax.naming`. Referenced from `org.bouncycastle.cert.dane.fetcher.JndiDANEFetcherFactory.1`."> + file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.75/5adfef8a71a0933454739264b56283cc73dd2383/bcpkix-jdk18on-1.75.jar"/>