Skip to content

[pull] master from zhanghai:master #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Sep 24, 2024
Merged

[pull] master from zhanghai:master #37

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c1dc8b
Fix: Update SSHJ to 0.39.0
zhanghai Sep 22, 2024
05da8cc
Build: Update commons-net for FTP client to 3.11.1
zhanghai Sep 22, 2024
fdc6974
Build: Update libarchive-android
zhanghai Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,13 @@ dependencies {
// org.bouncycastle:bcprov-jdk15to18 instead.
exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
}
// SSHJ 0.36.0 requires Java 8.
//noinspection GradleDependency
implementation ('com.hierynomus:sshj:0.35.0') {
exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on'
def bouncy_castle_version = '1.78.1'
implementation "org.bouncycastle:bcprov-jdk15to18:$bouncy_castle_version"
implementation ('com.hierynomus:sshj:0.39.0') {
exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
exclude group: 'org.bouncycastle', module: 'bcpkix-jdk18on'
}
implementation "org.bouncycastle:bcpkix-jdk15to18:$bouncy_castle_version"
implementation 'com.leinardi.android:speed-dial:3.3.0'
implementation ('com.rapid7.client:dcerpc:0.12.1') {
// SMBJ-RPC depends on the JRE flavor of Guava which targets Java 8.
Expand All @@ -172,9 +174,7 @@ dependencies {
// Guava conflicts with com.google.guava:listenablefuture:1.0 pulled in by AndroidX Core
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
implementation 'com.takisoft.preferencex:preferencex:1.1.0'
// Commons Net 3.9.0 started using java.time.Duration in FTPClient.
//noinspection GradleDependency
implementation 'commons-net:commons-net:3.8.0'
implementation 'commons-net:commons-net:3.11.1'
// LicensesDialog 2.2.0 pulls in androidx.webkit and uses setForceDark() instead of correctly
// setting colors.
//noinspection GradleDependency
Expand All @@ -186,7 +186,6 @@ dependencies {
implementation ('eu.agno3.jcifs:jcifs-ng:2.1.10') {
exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
}
implementation 'org.bouncycastle:bcprov-jdk15to18:1.78.1'
implementation platform('io.coil-kt:coil-bom:2.7.0')
implementation 'io.coil-kt:coil'
implementation 'io.coil-kt:coil-gif'
Expand All @@ -195,7 +194,7 @@ dependencies {
implementation 'me.zhanghai.android.appiconloader:appiconloader:1.5.0'
implementation 'me.zhanghai.android.fastscroll:library:1.3.0'
implementation 'me.zhanghai.android.foregroundcompat:library:1.0.2'
implementation 'me.zhanghai.android.libarchive:library:1.1.1'
implementation 'me.zhanghai.android.libarchive:library:1.1.2'
implementation 'me.zhanghai.android.libselinux:library:2.1.0'
implementation 'me.zhanghai.android.retrofile:library:1.2.0'
implementation 'me.zhanghai.android.systemuihelper:library:1.0.0'
Expand Down