From a6e96f92d3ac9dbc6eac5a1abdbe8003d58e1415 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 7 Jul 2023 13:04:14 +0200
Subject: [PATCH] Bump dependencies

Bump Bouncy Castle to 1.75
Bump sop-java to 6.1.0
Bump pgpainless to 1.5.6
Bump wkd-java to 0.1.2
Bump vks-java to 0.1.3
Bump cert-d-pgpainless to 0.2.2
---
 build.gradle                                  |  6 +++++-
 .../java/org/pgpainless/pgpeasy/PGPeasy.java  | 20 ++++++++++++++-----
 version.gradle                                | 12 +++++------
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index ec3feeb..967ee51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,11 @@ dependencies {
     // CLI
     implementation "info.picocli:picocli:$picocliVersion"
 
-    implementation "org.pgpainless:pgpainless-cli:$pgpainlessVersion"
+    implementation ("org.pgpainless:pgpainless-cli:$pgpainlessVersion") {
+        exclude group:'rg.slf4j', module:'slf4j-nop'
+        exclude group:'ch.qos.logback', module:'logback-core'
+        exclude group:'ch.qos.logback', module:'logback-classic'
+    }
     implementation "org.pgpainless:sop-java-picocli:$sopJavaVersion"
     implementation ("org.pgpainless:wkd-java-cli:$wkdVersion") {
         exclude group:'rg.slf4j', module:'slf4j-nop'
diff --git a/src/main/java/org/pgpainless/pgpeasy/PGPeasy.java b/src/main/java/org/pgpainless/pgpeasy/PGPeasy.java
index 7ecff0b..172e61c 100644
--- a/src/main/java/org/pgpainless/pgpeasy/PGPeasy.java
+++ b/src/main/java/org/pgpainless/pgpeasy/PGPeasy.java
@@ -1,9 +1,7 @@
 package org.pgpainless.pgpeasy;
 
-import org.pgpainless.cli.PGPainlessCLI;
 import org.pgpainless.pgpeasy.commands.Packet;
 import org.pgpainless.pgpeasy.commands.WOT;
-import org.pgpainless.sop.SOPImpl;
 import pgp.cert_d.cli.PGPCertDCli;
 import pgp.vks.client.cli.VKSCLI;
 import pgp.wkd.cli.WKDCLI;
@@ -13,10 +11,12 @@ import sop.cli.picocli.SopCLI;
 import sop.cli.picocli.commands.ArmorCmd;
 import sop.cli.picocli.commands.DearmorCmd;
 import sop.cli.picocli.commands.DecryptCmd;
-import sop.cli.picocli.commands.DetachInbandSignatureAndMessageCmd;
 import sop.cli.picocli.commands.EncryptCmd;
 import sop.cli.picocli.commands.ExtractCertCmd;
 import sop.cli.picocli.commands.GenerateKeyCmd;
+import sop.cli.picocli.commands.InlineDetachCmd;
+import sop.cli.picocli.commands.InlineSignCmd;
+import sop.cli.picocli.commands.InlineVerifyCmd;
 import sop.cli.picocli.commands.SignCmd;
 import sop.cli.picocli.commands.VerifyCmd;
 
@@ -26,12 +26,14 @@ import sop.cli.picocli.commands.VerifyCmd;
                 EncryptCmd.class,
                 DecryptCmd.class,
                 SignCmd.class,
+                InlineSignCmd.class,
                 VerifyCmd.class,
+                InlineVerifyCmd.class,
                 ArmorCmd.class,
                 DearmorCmd.class,
                 ExtractCertCmd.class,
                 GenerateKeyCmd.class,
-                DetachInbandSignatureAndMessageCmd.class,
+                InlineDetachCmd.class,
 
                 // SOP as subcommand
                 SopCLI.class,
@@ -56,8 +58,16 @@ import sop.cli.picocli.commands.VerifyCmd;
 )
 public class PGPeasy {
 
+    static {
+        // Call static block of PGPainlessCLI
+        try {
+            Class.forName("org.pgpainless.cli.PGPainlessCLI");
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public static void main(String[] args) {
-        SopCLI.setSopInstance(new SOPImpl());
         int exitCode = execute(args);
         if (exitCode != 0) {
             System.exit(exitCode);
diff --git a/version.gradle b/version.gradle
index a26d37c..dab6e64 100644
--- a/version.gradle
+++ b/version.gradle
@@ -1,14 +1,14 @@
 allprojects {
     ext {
-        bouncyCastleVersion = '1.71'
+        bouncyCastleVersion = '1.75'
         slf4jVersion = '1.7.36'
         logbackVersion = '1.2.11'
         junitVersion = '5.8.2'
-        sopJavaVersion = '1.2.3'
+        sopJavaVersion = '6.1.0'
         picocliVersion = '4.6.3'
-        pgpainlessVersion = '1.2.1'
-        wkdVersion = '0.1.1'
-        vksVersion = '0.1.2'
-        certDPgpainlessVersion = '0.1.2'
+        pgpainlessVersion = '1.5.6'
+        wkdVersion = '0.1.2'
+        vksVersion = '0.1.3'
+        certDPgpainlessVersion = '0.2.2'
     }
 }