Use new graalvm metadata format

build.gradle.kts

@@ -30,7 +30,6 @@ application {
 graalvmNative {
     binaries {
         this["main"].run {
-            buildArgs.add("--install-exit-handlers")
             buildArgs.add("-Dfile.encoding=UTF-8")
             buildArgs.add("-J-Dfile.encoding=UTF-8")
             buildArgs.add("-march=compatibility")

graalvm-config-dir/jni-config.json

@@ -1,362 +0,0 @@
-[
-{
-  "name":"[B"
-},
-{
-  "name":"[Ljava.lang.String;"
-},
-{
-  "name":"[Z"
-},
-{
-  "name":"[[B"
-},
-{
-  "name":"com.sun.security.auth.module.UnixSystem",
-  "fields":[{"name":"gid"}, {"name":"groups"}, {"name":"uid"}, {"name":"username"}]
-},
-{
-  "name":"java.lang.Boolean",
-  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.lang.Class",
-  "methods":[{"name":"getCanonicalName","parameterTypes":[] }, {"name":"getClassLoader","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.ClassLoader",
-  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }, {"name":"loadClass","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.lang.ClassNotFoundException"
-},
-{
-  "name":"java.lang.Enum",
-  "methods":[{"name":"ordinal","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.IllegalArgumentException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.lang.IllegalStateException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.lang.Long",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"java.lang.NoClassDefFoundError"
-},
-{
-  "name":"java.lang.NoSuchMethodError"
-},
-{
-  "name":"java.lang.String"
-},
-{
-  "name":"java.lang.Thread",
-  "methods":[{"name":"currentThread","parameterTypes":[] }, {"name":"getStackTrace","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.Throwable",
-  "methods":[{"name":"getMessage","parameterTypes":[] }, {"name":"setStackTrace","parameterTypes":["java.lang.StackTraceElement[]"] }, {"name":"toString","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.UnsatisfiedLinkError",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"java.util.HashMap",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
-{
-  "name":"java.util.Map",
-  "methods":[{"name":"get","parameterTypes":["java.lang.Object"] }, {"name":"put","parameterTypes":["java.lang.Object","java.lang.Object"] }, {"name":"remove","parameterTypes":["java.lang.Object"] }]
-},
-{
-  "name":"java.util.UUID",
-  "methods":[{"name":"<init>","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }]
-},
-{
-  "name":"java.util.concurrent.ForkJoinWorkerThread"
-},
-{
-  "name":"jdk.internal.loader.ClassLoaders$AppClassLoader"
-},
-{
-  "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"
-},
-{
-  "name":"org.asamk.signal.manager.internal.SignalWebSocketHealthMonitor$KeepAliveSender"
-},
-{
-  "name":"org.asamk.signal.manager.storage.protocol.SignalProtocolStore",
-  "methods":[{"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"getIdentityKeyPair","parameterTypes":[] }, {"name":"getLocalRegistrationId","parameterTypes":[] }, {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, {"name":"loadKyberPreKey","parameterTypes":["int"] }, {"name":"loadPreKey","parameterTypes":["int"] }, {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"loadSignedPreKey","parameterTypes":["int"] }, {"name":"markKyberPreKeyUsed","parameterTypes":["int"] }, {"name":"markKyberPreKeyUsed","parameterTypes":["int","int","org.signal.libsignal.protocol.ecc.ECPublicKey"] }, {"name":"removePreKey","parameterTypes":["int"] }, {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }]
-},
-{
-  "name":"org.asamk.signal.manager.storage.senderKeys.SenderKeyStore",
-  "methods":[{"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }]
-},
-{
-  "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints",
-  "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }]
-},
-{
-  "name":"org.signal.libsignal.internal.CompletableFuture",
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }, {"name":"setCancellationId","parameterTypes":["long"] }]
-},
-{
-  "name":"org.signal.libsignal.internal.NativeHandleGuard$SimpleOwner",
-  "methods":[{"name":"unsafeNativeHandleWithoutGuard","parameterTypes":[] }]
-},
-{
-  "name":"org.signal.libsignal.net.CdsiLookupResponse",
-  "methods":[{"name":"<init>","parameterTypes":["java.util.Map","int"] }]
-},
-{
-  "name":"org.signal.libsignal.net.CdsiLookupResponse$Entry",
-  "methods":[{"name":"<init>","parameterTypes":["byte[]","byte[]"] }]
-},
-{
-  "name":"org.signal.libsignal.net.ChatConnection$ListenerBridge",
-  "methods":[{"name":"connectionInterrupted","parameterTypes":["java.lang.Throwable"] }, {"name":"onConnectionInterrupted","parameterTypes":["java.lang.Throwable"] }, {"name":"onIncomingMessage","parameterTypes":["byte[]","long","long"] }, {"name":"onQueueEmpty","parameterTypes":[] }, {"name":"onReceivedAlerts","parameterTypes":["java.lang.String[]"] }, {"name":"receivedAlerts","parameterTypes":["java.lang.String[]"] }, {"name":"receivedIncomingMessage","parameterTypes":["byte[]","long","long"] }, {"name":"receivedQueueEmpty","parameterTypes":[] }]
-},
-{
-  "name":"org.signal.libsignal.net.ChatConnection$Response",
-  "methods":[{"name":"<init>","parameterTypes":["int","java.lang.String","java.util.Map","byte[]"] }]
-},
-{
-  "name":"org.signal.libsignal.net.ChatService"
-},
-{
-  "name":"org.signal.libsignal.net.ChatService$DebugInfo"
-},
-{
-  "name":"org.signal.libsignal.net.ChatService$Response"
-},
-{
-  "name":"org.signal.libsignal.net.ChatService$ResponseAndDebugInfo"
-},
-{
-  "name":"org.signal.libsignal.net.ChatServiceException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.net.ChatServiceInactiveException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.net.DeviceDeregisteredException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.net.NetworkException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.net.RetryLaterException",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.signal.libsignal.net.TransportFailureException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.net.internal.BridgeChatListener"
-},
-{
-  "name":"org.signal.libsignal.protocol.DuplicateMessageException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.IdentityKey",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["byte[]"] }, {"name":"serialize","parameterTypes":[] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.IdentityKeyPair",
-  "methods":[{"name":"serialize","parameterTypes":[] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.InvalidKeyException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.InvalidKeyIdException"
-},
-{
-  "name":"org.signal.libsignal.protocol.InvalidMessageException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.NoSessionException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.SessionCipher$1",
-  "methods":[{"name":"loadPreKey","parameterTypes":["int"] }, {"name":"removePreKey","parameterTypes":["int"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.SignalProtocolAddress",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["java.lang.String","int"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.UntrustedIdentityException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.ecc.ECPublicKey",
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.fingerprint.FingerprintParsingException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.groups.state.SenderKeyRecord",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.groups.state.SenderKeyStore"
-},
-{
-  "name":"org.signal.libsignal.protocol.logging.Log",
-  "methods":[{"name":"log","parameterTypes":["int","java.lang.String","java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.message.PlaintextContent",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.signal.libsignal.protocol.message.PreKeySignalMessage",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.message.SenderKeyMessage",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.message.SignalMessage",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$Direction",
-  "fields":[{"name":"RECEIVING"}, {"name":"SENDING"}]
-},
-{
-  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$IdentityChange"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.KyberPreKeyRecord",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.signal.libsignal.protocol.state.KyberPreKeyStore"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.PreKeyRecord",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.signal.libsignal.protocol.state.PreKeyStore"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.SessionRecord",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["byte[]"] }]
-},
-{
-  "name":"org.signal.libsignal.protocol.state.SessionStore"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.SignedPreKeyRecord",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.signal.libsignal.protocol.state.SignedPreKeyStore"
-},
-{
-  "name":"org.signal.libsignal.protocol.state.internal.PreKeyStore"
-},
-{
-  "name":"org.signal.libsignal.usernames.BadDiscriminatorCharacterException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.BadNicknameCharacterException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.CannotBeEmptyException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.DiscriminatorCannotBeZeroException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.MissingSeparatorException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.NicknameTooLongException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.usernames.NicknameTooShortException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.signal.libsignal.zkgroup.InvalidInputException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.sqlite.BusyHandler",
-  "methods":[{"name":"callback","parameterTypes":["int"] }]
-},
-{
-  "name":"org.sqlite.Collation",
-  "methods":[{"name":"xCompare","parameterTypes":["java.lang.String","java.lang.String"] }]
-},
-{
-  "name":"org.sqlite.Function",
-  "fields":[{"name":"args"}, {"name":"context"}, {"name":"value"}],
-  "methods":[{"name":"xFunc","parameterTypes":[] }]
-},
-{
-  "name":"org.sqlite.Function$Aggregate",
-  "methods":[{"name":"clone","parameterTypes":[] }, {"name":"xFinal","parameterTypes":[] }, {"name":"xStep","parameterTypes":[] }]
-},
-{
-  "name":"org.sqlite.Function$Window",
-  "methods":[{"name":"xInverse","parameterTypes":[] }, {"name":"xValue","parameterTypes":[] }]
-},
-{
-  "name":"org.sqlite.ProgressHandler",
-  "methods":[{"name":"progress","parameterTypes":[] }]
-},
-{
-  "name":"org.sqlite.core.DB",
-  "methods":[{"name":"onCommit","parameterTypes":["boolean"] }, {"name":"onUpdate","parameterTypes":["int","java.lang.String","java.lang.String","long"] }, {"name":"throwex","parameterTypes":[] }, {"name":"throwex","parameterTypes":["int"] }]
-},
-{
-  "name":"org.sqlite.core.DB$ProgressObserver",
-  "methods":[{"name":"progress","parameterTypes":["int","int"] }]
-},
-{
-  "name":"org.sqlite.core.NativeDB",
-  "fields":[{"name":"busyHandler"}, {"name":"commitListener"}, {"name":"pointer"}, {"name":"progressHandler"}, {"name":"updateListener"}],
-  "methods":[{"name":"stringToUtf8ByteArray","parameterTypes":["java.lang.String"] }, {"name":"throwex","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.whispersystems.signalservice.api.websocket.SignalWebSocket$DelayedDisconnectThread"
-}
-]

graalvm-config-dir/predefined-classes-config.json

@@ -1,8 +0,0 @@
-[
-  {
-    "type":"agent-extracted",
-    "classes":[
-    ]
-  }
-]
-

graalvm-config-dir/proxy-config.json

@@ -1 +0,0 @@
-[{"interfaces":["java.sql.Connection"]},{"interfaces":["org.asamk.Signal"]},{"interfaces":["org.asamk.Signal$Configuration"]},{"interfaces":["org.asamk.Signal$Device"]},{"interfaces":["org.asamk.Signal$Group"]},{"interfaces":["org.asamk.Signal$Identity"]},{"interfaces":["org.asamk.SignalControl"]},{"interfaces":["org.freedesktop.dbus.interfaces.DBus"]}]

graalvm-config-dir/reachability-metadata.json

@@ -5149,6 +5149,9 @@
       "type": "org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
       "allPublicConstructors": true
     },
+    {
+      "type": "org.freedesktop.dbus.transport.jre.NativeTransportProvider"
+    },
     {
       "type": "org.graalvm.jniutils.JNIExceptionWrapperEntryPoints",
       "jniAccessible": true,
@@ -9414,6 +9417,9 @@
     {
       "type": "sun.text.resources.BreakIteratorResources"
     },
+    {
+      "type": "sun.text.resources.CollationData"
+    },
     {
       "type": "sun.text.resources.cldr.FormatData"
     },
@@ -9432,6 +9438,115 @@
           "java.sql.Connection"
         ]
       }
+    },
+    {
+      "type": {
+        "proxy": [
+          "org.freedesktop.dbus.interfaces.DBus"
+        ]
+      }
+    }
+  ],
+  "resources": [
+    {
+      "glob": "*signal_jni.*"
+    },
+    {
+      "glob": "*signal_jni_aarch64.*"
+    },
+    {
+      "glob": "*signal_jni_amd64.*"
+    },
+    {
+      "glob": "META-INF/maven/org.xerial/sqlite-jdbc/pom.properties"
+    },
+    {
+      "glob": "META-INF/services/ch.qos.logback.classic.spi.Configurator"
+    },
+    {
+      "glob": "META-INF/services/com.sun.net.httpserver.spi.HttpServerProvider"
+    },
+    {
+      "glob": "META-INF/services/java.net.spi.InetAddressResolverProvider"
+    },
+    {
+      "glob": "META-INF/services/java.net.spi.URLStreamHandlerProvider"
+    },
+    {
+      "glob": "META-INF/services/java.nio.channels.spi.SelectorProvider"
+    },
+    {
+      "glob": "META-INF/services/java.sql.Driver"
+    },
+    {
+      "glob": "META-INF/services/java.time.zone.ZoneRulesProvider"
+    },
+    {
+      "glob": "META-INF/services/java.util.spi.ResourceBundleControlProvider"
+    },
+    {
+      "glob": "META-INF/services/kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition"
+    },
+    {
+      "glob": "META-INF/services/kotlin.reflect.jvm.internal.impl.util.ModuleVisibilityHelper"
+    },
+    {
+      "glob": "META-INF/services/org.freedesktop.dbus.spi.message.ISocketProvider"
+    },
+    {
+      "glob": "META-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider"
+    },
+    {
+      "glob": "META-INF/services/org.slf4j.spi.SLF4JServiceProvider"
+    },
+    {
+      "glob": "com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_*"
+    },
+    {
+      "glob": "kotlin/collections/collections.kotlin_builtins"
+    },
+    {
+      "glob": "kotlin/kotlin.kotlin_builtins"
+    },
+    {
+      "glob": "libsignal_jni_amd64.so"
+    },
+    {
+      "glob": "net/sourceforge/argparse4j/internal/ArgumentParserImpl.properties"
+    },
+    {
+      "glob": "net/sourceforge/argparse4j/internal/ArgumentParserImpl_*.properties"
+    },
+    {
+      "glob": "net/sourceforge/argparse4j/internal/ArgumentParserImpl_fr.properties"
+    },
+    {
+      "glob": "net/sourceforge/argparse4j/internal/ArgumentParserImpl_fr_FR.properties"
+    },
+    {
+      "glob": "org/asamk/signal/manager/config/whisper.store"
+    },
+    {
+      "glob": "org/sqlite/native/Linux/x86_64/libsqlitejdbc.so"
+    },
+    {
+      "module": "java.base",
+      "glob": "jdk/internal/icu/impl/data/icudt76b/nfc.nrm"
+    },
+    {
+      "module": "java.base",
+      "glob": "jdk/internal/icu/impl/data/icudt76b/nfkc.nrm"
+    },
+    {
+      "module": "java.base",
+      "glob": "jdk/internal/icu/impl/data/icudt76b/uprops.icu"
+    },
+    {
+      "module": "java.base",
+      "glob": "sun/net/idn/uidna.spp"
+    },
+    {
+      "bundle": "net.sourceforge.argparse4j.internal.ArgumentParserImpl"
     }
   ]
 }

graalvm-config-dir/serialization-config.json

@@ -1,8 +0,0 @@
-{
-  "types":[
-  ],
-  "lambdaCapturingTypes":[
-  ],
-  "proxies":[
-  ]
-}