diff --git a/pgpainless-sop/build.gradle b/pgpainless-sop/build.gradle index aa0f5993..53b499c6 100644 --- a/pgpainless-sop/build.gradle +++ b/pgpainless-sop/build.gradle @@ -22,7 +22,7 @@ dependencies { testImplementation "ch.qos.logback:logback-classic:$logbackVersion" // 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")) api "org.pgpainless:sop-java:$sopJavaVersion" diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt index bf7e63f1..40ac811d 100644 --- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt +++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/ArmorImpl.kt @@ -12,7 +12,6 @@ import org.bouncycastle.util.io.Streams import org.pgpainless.decryption_verification.OpenPgpInputStream import org.pgpainless.util.ArmoredOutputStreamFactory import sop.Ready -import sop.enums.ArmorLabel import sop.exception.SOPGPException 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.") - } } diff --git a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt index c6761a39..46aa4f14 100644 --- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt +++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt @@ -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 } diff --git a/version.gradle b/version.gradle index 07c66ec5..4d36ca57 100644 --- a/version.gradle +++ b/version.gradle @@ -14,6 +14,6 @@ allprojects { logbackVersion = '1.5.13' mockitoVersion = '4.5.1' slf4jVersion = '1.7.36' - sopJavaVersion = '10.0.3' + sopJavaVersion = '10.1.0' } }