From 2870c7afa8d3992658b6e7a2974fb1c661055cea Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sun, 11 Aug 2024 13:41:47 +0200 Subject: [PATCH] V6-Preview --- .../src/main/kotlin/org/pgpainless/sop/VersionImpl.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 7ebdade9..a5c69d8f 100644 --- a/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt +++ b/pgpainless-sop/src/main/kotlin/org/pgpainless/sop/VersionImpl.kt @@ -4,10 +4,7 @@ package org.pgpainless.sop -import java.io.IOException -import java.io.InputStream import java.util.* -import org.bouncycastle.jce.provider.BouncyCastleProvider import sop.operation.Version /** Implementation of the `version` operation using PGPainless. */ @@ -21,8 +18,9 @@ class VersionImpl : Version { override fun getBackendVersion(): String = "PGPainless ${getVersion()}" override fun getExtendedVersion(): String { - val bcVersion = - String.format(Locale.US, "Bouncy Castle %.2f", BouncyCastleProvider().version) + // val bcVersion = + // String.format(Locale.US, "Bouncy Castle %.2f", BouncyCastleProvider().version) + val bcVersion = "Bouncy Castle 1.79 + V6-Patches" val specVersion = String.format("%02d", SOP_VERSION) return """${getName()} ${getVersion()} https://codeberg.org/PGPainless/pgpainless/src/branch/master/pgpainless-sop @@ -46,7 +44,9 @@ https://www.bouncycastle.org/java.html""" override fun getSopVVersion(): String = SOPV_VERSION override fun getVersion(): String { + return "1.7.0-V6_PREVIEW" // See https://stackoverflow.com/a/50119235 + /* return try { val resourceIn: InputStream = javaClass.getResourceAsStream("/version.properties") @@ -57,6 +57,7 @@ https://www.bouncycastle.org/java.html""" } catch (e: IOException) { "DEVELOPMENT" } + */ } override fun isSopSpecImplementationIncomplete(): Boolean = false