PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-09-09 18:29:39 +02:00
Code Issues Releases Wiki Activity

Bump sop-java to 10.1.0

Browse source
This commit is contained in:
Paul Schaub 2025-03-11 21:00:26 +01:00
parent 8854429205
commit 13c3295e64
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
4 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pgpainless-sop/build.gradle
View file

@ -22,7 +22,7 @@ dependencies {
testImplementation "ch.qos.logback:logback-classic:$logbackVersion" testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
// Depend on "shared" sop-java test suite (fixtures are turned into tests by inheritance inside test sources) // Depend on "shared" sop-java test suite (fixtures are turned into tests by inheritance inside test sources)
testImplementation(testFixtures("org.pgpainless:sop-java:$sopJavaVersion")) testImplementation "org.pgpainless:sop-java-testfixtures:$sopJavaVersion"
implementation(project(":pgpainless-core")) implementation(project(":pgpainless-core"))
api "org.pgpainless:sop-java:$sopJavaVersion" api "org.pgpainless:sop-java:$sopJavaVersion"

6
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt
View file

@ -12,7 +12,6 @@ import org.bouncycastle.util.io.Streams
import org.pgpainless.decryption_verification.OpenPgpInputStream import org.pgpainless.decryption_verification.OpenPgpInputStream
import org.pgpainless.util.ArmoredOutputStreamFactory import org.pgpainless.util.ArmoredOutputStreamFactory
import sop.Ready import sop.Ready
import sop.enums.ArmorLabel
import sop.exception.SOPGPException import sop.exception.SOPGPException
import sop.operation.Armor import sop.operation.Armor
@ -46,9 +45,4 @@ class ArmorImpl : Armor {
} }
} }
} }
@Deprecated("Setting custom labels is not supported.")
override fun label(label: ArmorLabel): Armor {
throw SOPGPException.UnsupportedOption("Setting custom Armor labels not supported.")
}
} }

12
pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt
View file

@ -72,17 +72,5 @@ https://www.bouncycastle.org/java.html"""
?: "" ?: ""
} }
private fun getSopJavaVersion(): String? {
return try {
val resourceIn: InputStream =
javaClass.getResourceAsStream("/sop-java-version.properties")
?: throw IOException("File sop-java-version.properties not found.")
val properties = Properties().apply { load(resourceIn) }
properties.getProperty("sop-java-version")
} catch (e: IOException) {
null
}
}
override fun isSopSpecImplementationIncomplete(): Boolean = false override fun isSopSpecImplementationIncomplete(): Boolean = false
} }

2
version.gradle
View file

@ -14,6 +14,6 @@ allprojects {
logbackVersion = '1.5.13' logbackVersion = '1.5.13'
mockitoVersion = '4.5.1' mockitoVersion = '4.5.1'
slf4jVersion = '1.7.36' slf4jVersion = '1.7.36'
sopJavaVersion = '10.0.3' sopJavaVersion = '10.1.0'
} }
} }