diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle.kts | 7 | ||||
| -rw-r--r-- | app/lint-baseline.xml | 8 | ||||
| -rw-r--r-- | app/proguard-rules.pro | 1 |
3 files changed, 9 insertions, 7 deletions
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 @@ <issue id="InvalidPackage" - message="Invalid package reference in org.bouncycastle:bcpkix-jdk18on; not included in Android: `javax.naming.directory`. Referenced from `org.bouncycastle.cert.dane.fetcher.JndiDANEFetcherFactory`."> + message="Invalid package reference in library; not included in Android: `javax.naming.directory`. Referenced from `org.bouncycastle.cert.dane.fetcher.JndiDANEFetcherFactory`."> <location - file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.76/10c9cf5c1b4d64abeda28ee32fbade3b74373622/bcpkix-jdk18on-1.76.jar"/> + file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.75/5adfef8a71a0933454739264b56283cc73dd2383/bcpkix-jdk18on-1.75.jar"/> </issue> <issue id="InvalidPackage" - message="Invalid package reference in org.bouncycastle:bcpkix-jdk18on; not included in Android: `javax.naming`. Referenced from `org.bouncycastle.cert.dane.fetcher.JndiDANEFetcherFactory.1`."> + message="Invalid package reference in library; not included in Android: `javax.naming`. Referenced from `org.bouncycastle.cert.dane.fetcher.JndiDANEFetcherFactory.1`."> <location - file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.76/10c9cf5c1b4d64abeda28ee32fbade3b74373622/bcpkix-jdk18on-1.76.jar"/> + file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.bouncycastle/bcpkix-jdk18on/1.75/5adfef8a71a0933454739264b56283cc73dd2383/bcpkix-jdk18on-1.75.jar"/> </issue> <issue diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9bd2a665..6dd3b79e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,7 +1,6 @@ -keepattributes SourceFile,LineNumberTable,EnclosingMethod,InnerClasses -dontobfuscate --keep class com.jcraft.jsch.** -keep class org.eclipse.jgit.internal.JGitText { *; } -keep class org.bouncycastle.jcajce.provider.** { *; } -keep class !org.bouncycastle.jce.provider.X509LDAPCertStoreSpi,org.bouncycastle.jce.provider.** { *; } |