1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-26 22:32:07 +01:00

V6-Preview

This commit is contained in:
Paul Schaub 2024-08-11 13:41:47 +02:00
parent 8677646780
commit 2870c7afa8
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311

View file

@ -4,10 +4,7 @@
package org.pgpainless.sop package org.pgpainless.sop
import java.io.IOException
import java.io.InputStream
import java.util.* import java.util.*
import org.bouncycastle.jce.provider.BouncyCastleProvider
import sop.operation.Version import sop.operation.Version
/** Implementation of the `version` operation using PGPainless. */ /** Implementation of the `version` operation using PGPainless. */
@ -21,8 +18,9 @@ class VersionImpl : Version {
override fun getBackendVersion(): String = "PGPainless ${getVersion()}" override fun getBackendVersion(): String = "PGPainless ${getVersion()}"
override fun getExtendedVersion(): String { override fun getExtendedVersion(): String {
val bcVersion = // val bcVersion =
String.format(Locale.US, "Bouncy Castle %.2f", BouncyCastleProvider().version) // String.format(Locale.US, "Bouncy Castle %.2f", BouncyCastleProvider().version)
val bcVersion = "Bouncy Castle 1.79 + V6-Patches"
val specVersion = String.format("%02d", SOP_VERSION) val specVersion = String.format("%02d", SOP_VERSION)
return """${getName()} ${getVersion()} return """${getName()} ${getVersion()}
https://codeberg.org/PGPainless/pgpainless/src/branch/master/pgpainless-sop 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 getSopVVersion(): String = SOPV_VERSION
override fun getVersion(): String { override fun getVersion(): String {
return "1.7.0-V6_PREVIEW"
// See https://stackoverflow.com/a/50119235 // See https://stackoverflow.com/a/50119235
/*
return try { return try {
val resourceIn: InputStream = val resourceIn: InputStream =
javaClass.getResourceAsStream("/version.properties") javaClass.getResourceAsStream("/version.properties")
@ -57,6 +57,7 @@ https://www.bouncycastle.org/java.html"""
} catch (e: IOException) { } catch (e: IOException) {
"DEVELOPMENT" "DEVELOPMENT"
} }
*/
} }
override fun isSopSpecImplementationIncomplete(): Boolean = false override fun isSopSpecImplementationIncomplete(): Boolean = false