kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(deps): update dependency org.pgpainless:pgpainless-core to v1.2.0 (#1832)

Browse source 
* chore(deps): update dependency org.pgpainless:pgpainless-core to v1.2.0

* gradle: bump bouncycastle to 1.71

* Transparently update older BC versions

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
renovate[bot] 2022-04-09 13:49:31 +00:00 committed by GitHub
parent e50b00cd98
commit 18cff9c144
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle.kts
View file

@ -11,6 +11,7 @@ plugins {
id("com.github.android-password-store.versioning-plugin") id("com.github.android-password-store.versioning-plugin")
id("com.github.android-password-store.sentry") id("com.github.android-password-store.sentry")
id("com.github.android-password-store.rename-artifacts") id("com.github.android-password-store.rename-artifacts")
id("com.github.android-password-store.bouncycastle-dependency")
id("dagger.hilt.android.plugin") id("dagger.hilt.android.plugin")
} }

13
build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.bouncycastle-dependency.gradle.kts Normal file
View file

@ -0,0 +1,13 @@
/**
* Bouncy Castle 1.71 changed their packaging to stop shipping jdk15on artifacts, and instead use
* multi-release JARs with the jdk15to18 suffix. This plugin replaces older dependencies to use the
* new version and artifact.
*/
configurations.all {
resolutionStrategy.eachDependency {
if (requested.group == "org.bouncycastle" && requested.name.contains("jdk15on")) {
val replacement = "${requested.group}:${requested.name.replace("jdk15on", "jdk15to18")}:1.71"
useTarget(replacement)
}
}
}

6
gradle/libs.versions.toml
View file

@ -73,7 +73,8 @@ kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines
kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
thirdparty-bouncycastle = "org.bouncycastle:bcprov-jdk15on:1.70" # Keep in sync with the bouncycastle-dependency plugin
thirdparty-bouncycastle = "org.bouncycastle:bcprov-jdk15to18:1.71"
thirdparty-commons_codec = "commons-codec:commons-codec:1.14" thirdparty-commons_codec = "commons-codec:commons-codec:1.14"
thirdparty-eddsa = "net.i2p.crypto:eddsa:0.3.0" thirdparty-eddsa = "net.i2p.crypto:eddsa:0.3.0"
thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.7" thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.7"
@ -86,8 +87,9 @@ thirdparty-logcat = "com.squareup.logcat:logcat:0.1"
thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.3.0" thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.3.0"
thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:18.0.1" thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:18.0.1"
thirdparty-nonfree-sentry = "io.sentry:sentry-android:5.7.2" thirdparty-nonfree-sentry = "io.sentry:sentry-android:5.7.2"
thirdparty-pgpainless = "org.pgpainless:pgpainless-core:1.1.5" thirdparty-pgpainless = "org.pgpainless:pgpainless-core:1.2.0"
thirdparty-sshauth = "com.github.open-keychain.open-keychain:sshauthentication-api:5.7.5" thirdparty-sshauth = "com.github.open-keychain.open-keychain:sshauthentication-api:5.7.5"
# TODO: Remove bouncycastle-dependency plugin when upgrading this to a BC 1.71 compatible version
thirdparty-sshj = "com.hierynomus:sshj:0.32.0" thirdparty-sshj = "com.hierynomus:sshj:0.32.0"
thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.1" thirdparty-whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.1"