From c108741b6f4c5d7ff29d5c15ff9a6e8574b2d32f Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Tue, 26 Mar 2024 10:04:05 +0200
Subject: [PATCH] upgrade to pgpainless 1.6.7 with basic modules support

---
 build.gradle                                       | 14 ++------------
 .../javamodules/ExtraModuleInfoTransform.java      |  2 +-
 drongo                                             |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0d2a1d06..e697bb8d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -248,6 +248,8 @@ jlink {
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core",
                    "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor",
+                   "--add-reads=com.sparrowwallet.merged.module=org.bouncycastle.pg",
+                   "--add-reads=com.sparrowwallet.merged.module=org.bouncycastle.provider",
                    "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]
 
         if(os.windows) {
@@ -705,18 +707,6 @@ extraJavaModuleInfo {
     module('jcommander-1.81.jar', 'com.beust.jcommander', '1.81') {
         exports('com.beust.jcommander')
     }
-    module('pgpainless-core-1.6.6.jar', 'org.pgpainless.core', '1.6.6') {
-        exports('org.pgpainless')
-        exports('org.pgpainless.key')
-        exports('org.pgpainless.key.parsing')
-        exports('org.pgpainless.decryption_verification')
-        exports('org.pgpainless.exception')
-        exports('org.pgpainless.signature')
-        exports('org.pgpainless.util')
-        requires('org.bouncycastle.provider')
-        requires('org.bouncycastle.pg')
-        requires('org.slf4j')
-    }
     module('jzlib-1.1.3.jar', 'com.jcraft.jzlib', '1.1.3') {
         exports('com.jcraft.jzlib')
     }
diff --git a/buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java b/buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java
index 1a05d530..c892bdb7 100644
--- a/buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java
+++ b/buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java
@@ -143,7 +143,7 @@ abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraM
     private static void copyEntries(JarInputStream inputStream, JarOutputStream outputStream) throws IOException {
         JarEntry jarEntry = inputStream.getNextJarEntry();
         while (jarEntry != null) {
-            if(!jarEntry.getName().equals("module-info.class") && !jarEntry.getName().equals("org/bouncycastle/CachingBcPublicKeyDataDecryptorFactory.class")) {
+            if(!jarEntry.getName().equals("module-info.class")) {
                 outputStream.putNextEntry(jarEntry);
                 outputStream.write(inputStream.readAllBytes());
                 outputStream.closeEntry();
diff --git a/drongo b/drongo
index 3b8435ca..9872c6b6 160000
--- a/drongo
+++ b/drongo
@@ -1 +1 @@
-Subproject commit 3b8435ca37d00d370d859fa9dbc1631d3cdcae45
+Subproject commit 9872c6b6ecfa6f5d14cd2edcb5605b76e9cb7396