From d55b00d8ba519d894e7b21a6fd68c66629d7853b Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Sat, 22 Feb 2025 12:13:20 +0530 Subject: [PATCH 1/5] chore: Upgraded JDK from 21 LTS to 23 Signed-off-by: Saptarshi Sarkar --- .github/workflows/build.yml | 4 +- .github/workflows/codeql.yml | 4 +- .github/workflows/docker-publish.yml | 4 +- .github/workflows/formatter.yml | 4 +- .idea/misc.xml | 2 +- .../native-image/reachability-metadata.json | 1807 +++++++++++++++++ .../native-image/resource-config.json | 191 +- pom.xml | 8 +- 8 files changed, 1821 insertions(+), 203 deletions(-) create mode 100644 GUI/src/main/resources/META-INF/native-image/reachability-metadata.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e096b4178..ea7920946 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,10 +97,10 @@ jobs: retry_wait_seconds: '30' command: | Core/src/main/resources/yt-dlp.exe -U - - name: Set up GraalVM JDK 21 + - name: Set up GraalVM JDK 23 uses: graalvm/setup-graalvm@v1 with: - java-version: '21' + java-version: '23' distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} set-java-home: true diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5b53cc691..01e3c157c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -30,12 +30,12 @@ jobs: languages: ${{ matrix.language }} queries: security-extended,security-and-quality - - name: Setup JDK 21 + - name: Setup JDK 23 if: ${{ matrix.language == 'java-kotlin' }} uses: actions/setup-java@v4 with: distribution: 'oracle' - java-version: 21 + java-version: 23 - name: Build with Maven if: ${{ matrix.language == 'java-kotlin' }} diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index ceb7a0eb3..f32027b20 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -74,10 +74,10 @@ jobs: run: | chmod +x Core/src/main/resources/yt-dlp Core/src/main/resources/yt-dlp -U - - name: Set up GraalVM JDK 21 + - name: Set up GraalVM JDK 23 uses: graalvm/setup-graalvm@v1 with: - java-version: '21' + java-version: '23' distribution: 'graalvm' github-token: ${{ secrets.GITHUB_TOKEN }} set-java-home: true diff --git a/.github/workflows/formatter.yml b/.github/workflows/formatter.yml index 41358a04a..97cfc41f2 100644 --- a/.github/workflows/formatter.yml +++ b/.github/workflows/formatter.yml @@ -20,11 +20,11 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Setup JDK 21 + - name: Setup JDK 23 uses: actions/setup-java@v4 with: distribution: 'oracle' - java-version: 21 + java-version: 23 - name: Format Java files run: mvn rewrite:run - name: Install prettier diff --git a/.idea/misc.xml b/.idea/misc.xml index fdc35ea81..001e75669 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/GUI/src/main/resources/META-INF/native-image/reachability-metadata.json b/GUI/src/main/resources/META-INF/native-image/reachability-metadata.json new file mode 100644 index 000000000..1d542ff2f --- /dev/null +++ b/GUI/src/main/resources/META-INF/native-image/reachability-metadata.json @@ -0,0 +1,1807 @@ +{ + "reflection": [ + { + "type": "[B" + }, + { + "type": "[Ljava.lang.String;" + }, + { + "type": "[Lsun.security.pkcs.SignerInfo;" + }, + { + "type": "com.sun.crypto.provider.AESCipher$General", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.AESKeyGenerator", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.ARCFOURCipher", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.ChaCha20Cipher$ChaCha20Poly1305", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.DESCipher", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.DESedeCipher", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.DHParameters", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.GaloisCounterMode$AESGCM", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.HmacCore$HmacSHA256", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.HmacCore$HmacSHA384", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.crypto.provider.TlsMasterSecretGenerator", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.javafx.font.freetype.FTFactory", + "methods": [ + { + "name": "getFactory", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.javafx.logging.PrintLogger", + "methods": [ + { + "name": "createInstance", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.javafx.logging.jfr.JFRPulseLogger", + "methods": [ + { + "name": "createInstance", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.javafx.scene.control.skin.Utils", + "methods": [ + { + "name": "getResource", + "parameterTypes": [ + "java.lang.String" + ] + } + ] + }, + { + "type": "com.sun.javafx.tk.quantum.OverlayWarning" + }, + { + "type": "com.sun.javafx.tk.quantum.QuantumToolkit", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.prism.GraphicsPipeline", + "methods": [ + { + "name": "getFontFactory", + "parameterTypes": [] + }, + { + "name": "getPipeline", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.prism.shader.DrawPgram_Color_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.DrawRoundRect_Color_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.FillPgram_Color_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.FillPgram_LinearGradient_PAD_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.FillRoundRect_Color_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.Mask_TextureSuper_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.Solid_TextureFirstPassLCD_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.Solid_TextureRGB_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.Solid_TextureSecondPassLCD_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.Texture_Color_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.prism.shader.Texture_LinearGradient_PAD_Loader", + "methods": [ + { + "name": "loadShader", + "parameterTypes": [ + "com.sun.prism.ps.ShaderFactory", + "java.io.InputStream" + ] + } + ] + }, + { + "type": "com.sun.scenario.effect.impl.prism.PrRenderer", + "methods": [ + { + "name": "createRenderer", + "parameterTypes": [ + "com.sun.scenario.effect.FilterContext" + ] + } + ] + }, + { + "type": "com.sun.scenario.effect.impl.prism.ps.PPSBlend_SRC_INPeer", + "methods": [ + { + "name": "", + "parameterTypes": [ + "com.sun.scenario.effect.FilterContext", + "com.sun.scenario.effect.impl.Renderer", + "java.lang.String" + ] + } + ] + }, + { + "type": "com.sun.scenario.effect.impl.prism.ps.PPSLinearConvolveShadowPeer", + "methods": [ + { + "name": "", + "parameterTypes": [ + "com.sun.scenario.effect.FilterContext", + "com.sun.scenario.effect.impl.Renderer", + "java.lang.String" + ] + } + ] + }, + { + "type": "com.sun.scenario.effect.impl.prism.ps.PPSRenderer", + "methods": [ + { + "name": "createRenderer", + "parameterTypes": [ + "com.sun.scenario.effect.FilterContext" + ] + } + ] + }, + { + "type": "gui.support.Folders", + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "gui.support.Jobs", + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "java.lang.Character", + "methods": [ + { + "name": "isIdeographic", + "parameterTypes": [ + "int" + ] + } + ] + }, + { + "type": "java.lang.Class", + "methods": [ + { + "name": "forName", + "parameterTypes": [ + "java.lang.Module", + "java.lang.String" + ] + }, + { + "name": "getModule", + "parameterTypes": [] + }, + { + "name": "getRecordComponents", + "parameterTypes": [] + }, + { + "name": "isRecord", + "parameterTypes": [] + } + ] + }, + { + "type": "java.lang.Module", + "methods": [ + { + "name": "getDescriptor", + "parameterTypes": [] + }, + { + "name": "getLayer", + "parameterTypes": [] + }, + { + "name": "getName", + "parameterTypes": [] + } + ] + }, + { + "type": "java.lang.ModuleLayer", + "methods": [ + { + "name": "boot", + "parameterTypes": [] + }, + { + "name": "findModule", + "parameterTypes": [ + "java.lang.String" + ] + } + ] + }, + { + "type": "java.lang.String" + }, + { + "type": "java.lang.Thread", + "fields": [ + { + "name": "threadLocalRandomProbe" + } + ] + }, + { + "type": "java.lang.reflect.RecordComponent", + "methods": [ + { + "name": "getName", + "parameterTypes": [] + }, + { + "name": "getType", + "parameterTypes": [] + } + ] + }, + { + "type": "java.nio.ByteBuffer", + "methods": [ + { + "name": "order", + "parameterTypes": [ + "java.nio.ByteOrder" + ] + } + ] + }, + { + "type": "java.nio.ByteOrder", + "methods": [ + { + "name": "nativeOrder", + "parameterTypes": [] + } + ] + }, + { + "type": "java.security.AlgorithmParametersSpi" + }, + { + "type": "java.security.KeyStoreSpi" + }, + { + "type": "java.security.SecureRandomParameters" + }, + { + "type": "java.security.interfaces.ECPrivateKey" + }, + { + "type": "java.security.interfaces.ECPublicKey" + }, + { + "type": "java.security.interfaces.RSAPrivateKey" + }, + { + "type": "java.security.interfaces.RSAPublicKey" + }, + { + "type": "java.sql.Date" + }, + { + "type": "java.util.ArrayList", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "java.util.Date" + }, + { + "type": "java.util.HashMap", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "java.util.LinkedList", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "java.util.concurrent.ConcurrentLinkedDeque", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "java.util.concurrent.ForkJoinTask", + "fields": [ + { + "name": "aux" + }, + { + "name": "status" + } + ] + }, + { + "type": "java.util.concurrent.atomic.AtomicBoolean", + "fields": [ + { + "name": "value" + } + ] + }, + { + "type": "java.util.concurrent.atomic.AtomicReference", + "fields": [ + { + "name": "value" + } + ] + }, + { + "type": "java.util.concurrent.atomic.Striped64", + "fields": [ + { + "name": "base" + }, + { + "name": "cellsBusy" + } + ] + }, + { + "type": "java.util.concurrent.atomic.Striped64$Cell", + "fields": [ + { + "name": "value" + } + ] + }, + { + "type": "javafx.scene.Camera" + }, + { + "type": "javafx.scene.Group" + }, + { + "type": "javafx.scene.Node" + }, + { + "type": "javafx.scene.ParallelCamera" + }, + { + "type": "javafx.scene.Parent" + }, + { + "type": "javafx.scene.Scene" + }, + { + "type": "javafx.scene.control.Control" + }, + { + "type": "javafx.scene.control.Labeled" + }, + { + "type": "javafx.scene.effect.Effect" + }, + { + "type": "javafx.scene.image.Image" + }, + { + "type": "javafx.scene.image.ImageView" + }, + { + "type": "javafx.scene.input.Clipboard" + }, + { + "type": "javafx.scene.layout.Pane" + }, + { + "type": "javafx.scene.layout.Region" + }, + { + "type": "javafx.scene.shape.LineTo" + }, + { + "type": "javafx.scene.shape.MoveTo" + }, + { + "type": "javafx.scene.shape.Path" + }, + { + "type": "javafx.scene.shape.PathElement" + }, + { + "type": "javafx.scene.shape.Rectangle" + }, + { + "type": "javafx.scene.shape.SVGPath" + }, + { + "type": "javafx.scene.shape.Shape" + }, + { + "type": "javafx.scene.text.Font" + }, + { + "type": "javafx.scene.text.Text" + }, + { + "type": "javafx.scene.transform.Transform" + }, + { + "type": "javafx.stage.PopupWindow" + }, + { + "type": "javafx.stage.Stage" + }, + { + "type": "javafx.stage.Window" + }, + { + "type": "javax.security.auth.x500.X500Principal", + "fields": [ + { + "name": "thisX500Name" + } + ], + "methods": [ + { + "name": "", + "parameterTypes": [ + "sun.security.x509.X500Name" + ] + } + ] + }, + { + "type": "jdk.internal.misc.Unsafe" + }, + { + "type": "main.Drifty_GUI", + "methods": [ + { + "name": "", + "parameterTypes": [] + }, + { + "name": "main", + "parameterTypes": [ + "java.lang.String[]" + ] + } + ] + }, + { + "type": "sun.misc.Unsafe", + "fields": [ + { + "name": "theUnsafe" + } + ], + "methods": [ + { + "name": "allocateInstance", + "parameterTypes": [ + "java.lang.Class" + ] + } + ] + }, + { + "type": "sun.security.pkcs12.PKCS12KeyStore", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.pkcs12.PKCS12KeyStore$DualFormatPKCS12", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.DSA$SHA224withDSA", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.DSA$SHA256withDSA", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.JavaKeyStore$DualFormatJKS", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.JavaKeyStore$JKS", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.MD5", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.NativePRNG", + "methods": [ + { + "name": "", + "parameterTypes": [] + }, + { + "name": "", + "parameterTypes": [ + "java.security.SecureRandomParameters" + ] + } + ] + }, + { + "type": "sun.security.provider.SHA", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.SHA2$SHA224", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.SHA2$SHA256", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.SHA5$SHA384", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.SHA5$SHA512", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.X509Factory", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.provider.certpath.PKIXCertPathValidator", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.rsa.PSSParameters", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.rsa.RSAKeyFactory$Legacy", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.rsa.RSAPSSSignature", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.rsa.RSASignature$SHA224withRSA", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.rsa.RSASignature$SHA256withRSA", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.ssl.KeyManagerFactoryImpl$SunX509", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.ssl.SSLContextImpl$DefaultSSLContext", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.ssl.TrustManagerFactoryImpl$PKIXFactory", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "sun.security.util.ObjectIdentifier" + }, + { + "type": "sun.security.x509.AuthorityInfoAccessExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.AuthorityKeyIdentifierExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.BasicConstraintsExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.CRLDistributionPointsExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.CertificateExtensions" + }, + { + "type": "sun.security.x509.CertificatePoliciesExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.ExtendedKeyUsageExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.IssuerAlternativeNameExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.KeyUsageExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.NetscapeCertTypeExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.PrivateKeyUsageExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.SubjectAlternativeNameExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "sun.security.x509.SubjectKeyIdentifierExtension", + "methods": [ + { + "name": "", + "parameterTypes": [ + "java.lang.Boolean", + "java.lang.Object" + ] + } + ] + }, + { + "type": "support.Job", + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "support.JobHistory", + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "support.Jobs", + "allDeclaredFields": true, + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "ui.Splash", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + } + ], + "jni": [ + { + "type": "[Lcom.sun.glass.ui.Screen;" + }, + { + "type": "[Lcom.sun.javafx.font.FontConfigManager$FontConfigFont;" + }, + { + "type": "[Ljava.lang.String;" + }, + { + "type": "com.sun.glass.ui.Clipboard", + "methods": [ + { + "name": "contentChanged", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.glass.ui.Cursor", + "fields": [ + { + "name": "ptr" + } + ] + }, + { + "type": "com.sun.glass.ui.Pixels", + "methods": [ + { + "name": "attachData", + "parameterTypes": [ + "long" + ] + } + ] + }, + { + "type": "com.sun.glass.ui.Screen", + "methods": [ + { + "name": "", + "parameterTypes": [ + "long", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "float", + "float", + "float", + "float" + ] + }, + { + "name": "notifySettingsChanged", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.glass.ui.Size", + "methods": [ + { + "name": "", + "parameterTypes": [ + "int", + "int" + ] + } + ] + }, + { + "type": "com.sun.glass.ui.View", + "fields": [ + { + "name": "ptr" + } + ], + "methods": [ + { + "name": "notifyDragDrop", + "parameterTypes": [ + "int", + "int", + "int", + "int", + "int" + ] + }, + { + "name": "notifyDragEnter", + "parameterTypes": [ + "int", + "int", + "int", + "int", + "int" + ] + }, + { + "name": "notifyDragLeave", + "parameterTypes": [] + }, + { + "name": "notifyDragOver", + "parameterTypes": [ + "int", + "int", + "int", + "int", + "int" + ] + }, + { + "name": "notifyInputMethod", + "parameterTypes": [ + "java.lang.String", + "int[]", + "int[]", + "byte[]", + "int", + "int", + "int" + ] + }, + { + "name": "notifyKey", + "parameterTypes": [ + "int", + "int", + "char[]", + "int" + ] + }, + { + "name": "notifyMenu", + "parameterTypes": [ + "int", + "int", + "int", + "int", + "boolean" + ] + }, + { + "name": "notifyMouse", + "parameterTypes": [ + "int", + "int", + "int", + "int", + "int", + "int", + "int", + "boolean", + "boolean" + ] + }, + { + "name": "notifyRepaint", + "parameterTypes": [ + "int", + "int", + "int", + "int" + ] + }, + { + "name": "notifyResize", + "parameterTypes": [ + "int", + "int" + ] + }, + { + "name": "notifyScroll", + "parameterTypes": [ + "int", + "int", + "int", + "int", + "double", + "double", + "int", + "int", + "int", + "int", + "int", + "double", + "double" + ] + }, + { + "name": "notifyView", + "parameterTypes": [ + "int" + ] + } + ] + }, + { + "type": "com.sun.glass.ui.Window", + "fields": [ + { + "name": "ptr" + } + ], + "methods": [ + { + "name": "isEnabled", + "parameterTypes": [] + }, + { + "name": "notifyClose", + "parameterTypes": [] + }, + { + "name": "notifyDelegatePtr", + "parameterTypes": [ + "long" + ] + }, + { + "name": "notifyDestroy", + "parameterTypes": [] + }, + { + "name": "notifyFocus", + "parameterTypes": [ + "int" + ] + }, + { + "name": "notifyFocusDisabled", + "parameterTypes": [] + }, + { + "name": "notifyFocusUngrab", + "parameterTypes": [] + }, + { + "name": "notifyLevelChanged", + "parameterTypes": [ + "int" + ] + }, + { + "name": "notifyMove", + "parameterTypes": [ + "int", + "int" + ] + }, + { + "name": "notifyMoveToAnotherScreen", + "parameterTypes": [ + "com.sun.glass.ui.Screen" + ] + }, + { + "name": "notifyResize", + "parameterTypes": [ + "int", + "int", + "int" + ] + } + ] + }, + { + "type": "com.sun.javafx.font.FontConfigManager$FcCompFont", + "fields": [ + { + "name": "allFonts" + }, + { + "name": "fcName" + }, + { + "name": "firstFont" + } + ] + }, + { + "type": "com.sun.javafx.font.FontConfigManager$FontConfigFont", + "fields": [ + { + "name": "familyName" + }, + { + "name": "fontFile" + }, + { + "name": "fullName" + }, + { + "name": "styleStr" + } + ], + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.javafx.font.freetype.FT_Bitmap", + "fields": [ + { + "name": "buffer" + }, + { + "name": "num_grays" + }, + { + "name": "palette" + }, + { + "name": "palette_mode" + }, + { + "name": "pitch" + }, + { + "name": "pixel_mode" + }, + { + "name": "rows" + }, + { + "name": "width" + } + ] + }, + { + "type": "com.sun.javafx.font.freetype.FT_GlyphSlotRec", + "fields": [ + { + "name": "advance_x" + }, + { + "name": "advance_y" + }, + { + "name": "bitmap" + }, + { + "name": "bitmap_left" + }, + { + "name": "bitmap_top" + }, + { + "name": "format" + }, + { + "name": "linearHoriAdvance" + }, + { + "name": "linearVertAdvance" + }, + { + "name": "metrics" + } + ], + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "com.sun.javafx.font.freetype.FT_Glyph_Metrics", + "fields": [ + { + "name": "height" + }, + { + "name": "horiAdvance" + }, + { + "name": "horiBearingX" + }, + { + "name": "horiBearingY" + }, + { + "name": "vertAdvance" + }, + { + "name": "vertBearingX" + }, + { + "name": "vertBearingY" + }, + { + "name": "width" + } + ] + }, + { + "type": "com.sun.javafx.geom.Path2D", + "methods": [ + { + "name": "", + "parameterTypes": [ + "int", + "byte[]", + "int", + "float[]", + "int" + ] + } + ] + }, + { + "type": "java.lang.Boolean", + "fields": [ + { + "name": "FALSE" + }, + { + "name": "TRUE" + } + ] + }, + { + "type": "java.lang.Iterable", + "methods": [ + { + "name": "iterator", + "parameterTypes": [] + } + ] + }, + { + "type": "java.lang.Object", + "methods": [ + { + "name": "equals", + "parameterTypes": [ + "java.lang.Object" + ] + } + ] + }, + { + "type": "java.lang.Runnable", + "methods": [ + { + "name": "run", + "parameterTypes": [] + } + ] + }, + { + "type": "java.lang.String", + "methods": [ + { + "name": "", + "parameterTypes": [ + "byte[]", + "java.lang.String" + ] + }, + { + "name": "getBytes", + "parameterTypes": [ + "java.lang.String" + ] + }, + { + "name": "toLowerCase", + "parameterTypes": [ + "java.util.Locale" + ] + } + ] + }, + { + "type": "java.nio.ByteBuffer", + "methods": [ + { + "name": "array", + "parameterTypes": [] + }, + { + "name": "wrap", + "parameterTypes": [ + "byte[]" + ] + } + ] + }, + { + "type": "java.util.ArrayList", + "methods": [ + { + "name": "", + "parameterTypes": [] + }, + { + "name": "", + "parameterTypes": [ + "int" + ] + }, + { + "name": "add", + "parameterTypes": [ + "java.lang.Object" + ] + }, + { + "name": "get", + "parameterTypes": [ + "int" + ] + } + ] + }, + { + "type": "java.util.Collections", + "methods": [ + { + "name": "unmodifiableMap", + "parameterTypes": [ + "java.util.Map" + ] + } + ] + }, + { + "type": "java.util.HashMap", + "methods": [ + { + "name": "", + "parameterTypes": [] + }, + { + "name": "containsKey", + "parameterTypes": [ + "java.lang.Object" + ] + }, + { + "name": "get", + "parameterTypes": [ + "java.lang.Object" + ] + }, + { + "name": "put", + "parameterTypes": [ + "java.lang.Object", + "java.lang.Object" + ] + } + ] + }, + { + "type": "java.util.HashSet", + "methods": [ + { + "name": "", + "parameterTypes": [] + } + ] + }, + { + "type": "java.util.Iterator", + "methods": [ + { + "name": "hasNext", + "parameterTypes": [] + }, + { + "name": "next", + "parameterTypes": [] + } + ] + }, + { + "type": "java.util.Map", + "methods": [ + { + "name": "containsKey", + "parameterTypes": [ + "java.lang.Object" + ] + }, + { + "name": "get", + "parameterTypes": [ + "java.lang.Object" + ] + }, + { + "name": "keySet", + "parameterTypes": [] + }, + { + "name": "put", + "parameterTypes": [ + "java.lang.Object", + "java.lang.Object" + ] + } + ] + }, + { + "type": "java.util.Set", + "methods": [ + { + "name": "add", + "parameterTypes": [ + "java.lang.Object" + ] + }, + { + "name": "size", + "parameterTypes": [] + }, + { + "name": "toArray", + "parameterTypes": [ + "java.lang.Object[]" + ] + } + ] + }, + { + "type": "javafx.scene.paint.Color", + "methods": [ + { + "name": "rgb", + "parameterTypes": [ + "int", + "int", + "int", + "double" + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/GUI/src/main/resources/META-INF/native-image/resource-config.json b/GUI/src/main/resources/META-INF/native-image/resource-config.json index 63a32fc10..e6c05fd90 100644 --- a/GUI/src/main/resources/META-INF/native-image/resource-config.json +++ b/GUI/src/main/resources/META-INF/native-image/resource-config.json @@ -1,190 +1 @@ -{ - "resources":{ - "includes":[{ - "pattern":"GUI:\\QBackgrounds/DriftyMainDark.png\\E" - }, { - "pattern":"GUI:\\QBackgrounds/DriftyMainLight.png\\E" - }, { - "pattern":"GUI:\\QButtons/Save/SaveDownDark.png\\E" - }, { - "pattern":"GUI:\\QButtons/Save/SaveDownLight.png\\E" - }, { - "pattern":"GUI:\\QButtons/Save/SaveUpDark.png\\E" - }, { - "pattern":"GUI:\\QButtons/Save/SaveUpLight.png\\E" - }, { - "pattern":"GUI:\\QButtons/Start/StartDownDark.png\\E" - }, { - "pattern":"GUI:\\QButtons/Start/StartDownLight.png\\E" - }, { - "pattern":"GUI:\\QButtons/Start/StartUpDark.png\\E" - }, { - "pattern":"GUI:\\QButtons/Start/StartUpLight.png\\E" - }, { - "pattern":"GUI:\\QCSS/Button.css\\E" - }, { - "pattern":"GUI:\\QCSS/CheckBox.css\\E" - }, { - "pattern":"GUI:\\QCSS/ContextMenu.css\\E" - }, { - "pattern":"GUI:\\QCSS/DarkTheme.css\\E" - }, { - "pattern":"GUI:\\QCSS/Label.css\\E" - }, { - "pattern":"GUI:\\QCSS/LightTheme.css\\E" - }, { - "pattern":"GUI:\\QCSS/ListView.css\\E" - }, { - "pattern":"GUI:\\QCSS/Menu.css\\E" - }, { - "pattern":"GUI:\\QCSS/ProgressBar.css\\E" - }, { - "pattern":"GUI:\\QCSS/ScrollPane.css\\E" - }, { - "pattern":"GUI:\\QCSS/TextField.css\\E" - }, { - "pattern":"GUI:\\QCSS/VBox.css\\E" - }, { - "pattern":"GUI:\\QFonts/Monaco.ttf\\E" - }, { - "pattern":"GUI:\\QIcons/AppIcon.png\\E" - }, { - "pattern":"GUI:\\QLabels/AutoPaste.png\\E" - }, { - "pattern":"GUI:\\QLabels/Directory.png\\E" - }, { - "pattern":"GUI:\\QLabels/Filename.png\\E" - }, { - "pattern":"GUI:\\QLabels/Link.png\\E" - }, { - "pattern":"GUI:\\QSplashDark.png\\E" - }, { - "pattern":"GUI:\\QSplashLight.png\\E" - }, { - "pattern":"\\QMETA-INF/fonts.mf\\E" - }, { - "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E" - }, { - "pattern":"\\QMETA-INF/services/java.net.spi.InetAddressResolverProvider\\E" - }, { - "pattern":"\\QMETA-INF/services/java.net.spi.URLStreamHandlerProvider\\E" - }, { - "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E" - }, { - "pattern":"\\QMETA-INF/services/java.nio.charset.spi.CharsetProvider\\E" - }, { - "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E" - }, { - "pattern":"\\QMETA-INF/services/java.util.prefs.PreferencesFactory\\E" - }, { - "pattern":"\\QMETA-INF/services/javax.xml.parsers.DocumentBuilderFactory\\E" - }, { - "pattern":"\\QMETA-INF/services/javax.xml.transform.TransformerFactory\\E" - }, { - "pattern":"\\Qcom/sun/javafx/scene/control/skin/resources/controls_en.properties\\E" - }, { - "pattern":"\\Qcom/sun/javafx/scene/control/skin/resources/controls_en_US.properties\\E" - }, { - "pattern":"\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en.properties\\E" - }, { - "pattern":"\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en_US.properties\\E" - }, { - "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/nfkc.nrm\\E" - }, { - "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/ubidi.icu\\E" - }, { - "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/uprops.icu\\E" - }, { - "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt74b/nfkc.nrm\\E" - }, { - "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt74b/ubidi.icu\\E" - }, { - "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt74b/uprops.icu\\E" - }, { - "pattern":"java.base:\\Qsun/net/idn/uidna.spp\\E" - }, { - "pattern":"java.xml:\\Qcom/sun/org/apache/xml/internal/serializer/Encodings.properties\\E" - }, { - "pattern":"java.xml:\\Qcom/sun/org/apache/xml/internal/serializer/XMLEntities.properties\\E" - }, { - "pattern":"java.xml:\\Qcom/sun/org/apache/xml/internal/serializer/XMLEntities_en.properties\\E" - }, { - "pattern":"java.xml:\\Qcom/sun/org/apache/xml/internal/serializer/XMLEntities_en_US.properties\\E" - }, { - "pattern":"java.xml:\\Qjdk/xml/internal/jdkcatalog/JDKCatalog.xml\\E" - }, { - "pattern":"javafx.controls:\\Qcom/sun/javafx/scene/control/skin/modena/modena.bss\\E" - }, { - "pattern":"javafx.controls:\\Qcom/sun/javafx/scene/control/skin/resources/controls.properties\\E" - }, { - "pattern":"javafx.controls:\\Qcom/sun/javafx/scene/control/skin/resources/controls_en.properties\\E" - }, { - "pattern":"javafx.controls:\\Qcom/sun/javafx/scene/control/skin/resources/controls_en_US.properties\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/glass/utils/NativeLibLoader.class\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle.properties\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en.properties\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en_US.properties\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/DrawPgram_Color.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/DrawRoundRect_Color.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/FillPgram_Color.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/FillPgram_LinearGradient_PAD.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/FillRoundRect_Color.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Mask_TextureSuper.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_TextureFirstPassLCD.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_TextureRGB.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_TextureSecondPassLCD.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Texture_Color.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Texture_LinearGradient_PAD.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/scenario/effect/impl/es2/glsl/Blend_SRC_IN.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/scenario/effect/impl/es2/glsl/LinearConvolveShadow_20.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/scenario/effect/impl/es2/glsl/LinearConvolveShadow_28.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qcom/sun/scenario/effect/impl/es2/glsl/LinearConvolveShadow_4.frag\\E" - }, { - "pattern":"javafx.graphics:\\Qlibglass.so\\E" - }, { - "pattern":"javafx.graphics:\\Qlibglassgtk3.so\\E" - }, { - "pattern":"javafx.graphics:\\Qlibjavafx_font.so\\E" - }, { - "pattern":"javafx.graphics:\\Qlibjavafx_font_freetype.so\\E" - }, { - "pattern":"javafx.graphics:\\Qlibjavafx_font_pango.so\\E" - }, { - "pattern":"javafx.graphics:\\Qlibprism_es2.so\\E" - }]}, - "bundles":[{ - "name":"com.sun.javafx.tk.quantum.QuantumMessagesBundle", - "locales":["", "en-US", "und"] - }, { - "name":"com.sun.org.apache.xml.internal.serializer.XMLEntities", - "locales":["", "en-US", "und"] - }, { - "name":"com/sun/javafx/scene/control/skin/resources/controls", - "locales":["", "en-US", "und"] - }, { - "name":"sun.text.resources.cldr.FormatData", - "locales":["en", "en-US", "und"] - }, { - "name":"sun.util.resources.cldr.CalendarData", - "locales":["und"] - }] -} +{"resources":{"includes":[{"pattern":"GUI:\\QBackgrounds/DriftyMainDark.png\\E"},{"pattern":"GUI:\\QBackgrounds/DriftyMainLight.png\\E"},{"pattern":"GUI:\\QButtons/Save/SaveDownDark.png\\E"},{"pattern":"GUI:\\QButtons/Save/SaveDownLight.png\\E"},{"pattern":"GUI:\\QButtons/Save/SaveUpDark.png\\E"},{"pattern":"GUI:\\QButtons/Save/SaveUpLight.png\\E"},{"pattern":"GUI:\\QButtons/Start/StartDownDark.png\\E"},{"pattern":"GUI:\\QButtons/Start/StartDownLight.png\\E"},{"pattern":"GUI:\\QButtons/Start/StartUpDark.png\\E"},{"pattern":"GUI:\\QButtons/Start/StartUpLight.png\\E"},{"pattern":"GUI:\\QCSS/Button.css\\E"},{"pattern":"GUI:\\QCSS/CheckBox.css\\E"},{"pattern":"GUI:\\QCSS/ContextMenu.css\\E"},{"pattern":"GUI:\\QCSS/DarkTheme.css\\E"},{"pattern":"GUI:\\QCSS/Label.css\\E"},{"pattern":"GUI:\\QCSS/LightTheme.css\\E"},{"pattern":"GUI:\\QCSS/ListView.css\\E"},{"pattern":"GUI:\\QCSS/Menu.css\\E"},{"pattern":"GUI:\\QCSS/ProgressBar.css\\E"},{"pattern":"GUI:\\QCSS/ScrollPane.css\\E"},{"pattern":"GUI:\\QCSS/TextField.css\\E"},{"pattern":"GUI:\\QCSS/VBox.css\\E"},{"pattern":"GUI:\\QFonts/Monaco.ttf\\E"},{"pattern":"GUI:\\QIcons/AppIcon.png\\E"},{"pattern":"GUI:\\QLabels/AutoPaste.png\\E"},{"pattern":"GUI:\\QLabels/Directory.png\\E"},{"pattern":"GUI:\\QLabels/Filename.png\\E"},{"pattern":"GUI:\\QLabels/Link.png\\E"},{"pattern":"GUI:\\QSplashDark.png\\E"},{"pattern":"GUI:\\QSplashLight.png\\E"},{"pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/nfkc.nrm\\E"},{"pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/ubidi.icu\\E"},{"pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/uprops.icu\\E"},{"pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt74b/nfkc.nrm\\E"},{"pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt74b/ubidi.icu\\E"},{"pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt74b/uprops.icu\\E"},{"pattern":"java.base:\\Qsun/net/idn/uidna.spp\\E"},{"pattern":"java.xml:\\Qcom/sun/org/apache/xml/internal/serializer/Encodings.properties\\E"},{"pattern":"java.xml:\\Qcom/sun/org/apache/xml/internal/serializer/XMLEntities.properties\\E"},{"pattern":"java.xml:\\Qcom/sun/org/apache/xml/internal/serializer/XMLEntities_en.properties\\E"},{"pattern":"java.xml:\\Qcom/sun/org/apache/xml/internal/serializer/XMLEntities_en_US.properties\\E"},{"pattern":"java.xml:\\Qjdk/xml/internal/jdkcatalog/JDKCatalog.xml\\E"},{"pattern":"javafx.controls:\\Qcom/sun/javafx/scene/control/skin/modena/modena.bss\\E"},{"pattern":"javafx.controls:\\Qcom/sun/javafx/scene/control/skin/resources/controls.properties\\E"},{"pattern":"javafx.controls:\\Qcom/sun/javafx/scene/control/skin/resources/controls_en.properties\\E"},{"pattern":"javafx.controls:\\Qcom/sun/javafx/scene/control/skin/resources/controls_en_US.properties\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/glass/utils/NativeLibLoader.class\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle.properties\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en.properties\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/javafx/tk/quantum/QuantumMessagesBundle_en_US.properties\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/DrawPgram_Color.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/DrawRoundRect_Color.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/FillPgram_Color.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/FillPgram_LinearGradient_PAD.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/FillRoundRect_Color.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Mask_TextureSuper.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_TextureFirstPassLCD.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_TextureRGB.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Solid_TextureSecondPassLCD.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Texture_Color.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/prism/es2/glsl/Texture_LinearGradient_PAD.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/scenario/effect/impl/es2/glsl/Blend_SRC_IN.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/scenario/effect/impl/es2/glsl/LinearConvolveShadow_20.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/scenario/effect/impl/es2/glsl/LinearConvolveShadow_28.frag\\E"},{"pattern":"javafx.graphics:\\Qcom/sun/scenario/effect/impl/es2/glsl/LinearConvolveShadow_4.frag\\E"},{"pattern":"javafx.graphics:\\Qlibglass.so\\E"},{"pattern":"javafx.graphics:\\Qlibglassgtk3.so\\E"},{"pattern":"javafx.graphics:\\Qlibjavafx_font.so\\E"},{"pattern":"javafx.graphics:\\Qlibjavafx_font_freetype.so\\E"},{"pattern":"javafx.graphics:\\Qlibjavafx_font_pango.so\\E"},{"pattern":"javafx.graphics:\\Qlibprism_es2.so\\E"}]},"bundles":[{"name":"com.sun.javafx.tk.quantum.QuantumMessagesBundle","locales":["en-US","und"]},{"name":"com.sun.org.apache.xml.internal.serializer.XMLEntities","locales":["en-US","und"]},{"name":"com/sun/javafx/scene/control/skin/resources/controls","locales":["en-US","und"]},{"name":"sun.text.resources.cldr.FormatData","locales":["en","en-US","und"]},{"name":"sun.util.resources.cldr.CalendarData","locales":["und"]}],"globs":[{"glob":"META-INF/fonts.mf"},{"glob":"META-INF/services/java.lang.System$LoggerFinder"},{"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.nio.charset.spi.CharsetProvider"},{"glob":"META-INF/services/java.time.zone.ZoneRulesProvider"},{"glob":"META-INF/services/java.util.prefs.PreferencesFactory"},{"glob":"META-INF/services/javax.xml.parsers.DocumentBuilderFactory"},{"glob":"META-INF/services/javax.xml.transform.TransformerFactory"},{"glob":"com/sun/javafx/scene/control/skin/resources/controls_en.properties"},{"glob":"com/sun/javafx/scene/control/skin/resources/controls_en_US.properties"},{"glob":"com/sun/javafx/tk/quantum/QuantumMessagesBundle_en.properties"},{"glob":"com/sun/javafx/tk/quantum/QuantumMessagesBundle_en_US.properties"},{"glob":"ffmpeg"},{"glob":"yt-dlp"},{"module":"GUI","glob":"Backgrounds/DriftyMainDark.png"},{"module":"GUI","glob":"Buttons/Save/SaveDownDark.png"},{"module":"GUI","glob":"Buttons/Save/SaveDownLight.png"},{"module":"GUI","glob":"Buttons/Save/SaveUpDark.png"},{"module":"GUI","glob":"Buttons/Save/SaveUpLight.png"},{"module":"GUI","glob":"Buttons/Start/StartDownDark.png"},{"module":"GUI","glob":"Buttons/Start/StartDownLight.png"},{"module":"GUI","glob":"Buttons/Start/StartUpDark.png"},{"module":"GUI","glob":"Buttons/Start/StartUpLight.png"},{"module":"GUI","glob":"CSS/Button.css"},{"module":"GUI","glob":"CSS/CheckBox.css"},{"module":"GUI","glob":"CSS/ContextMenu.css"},{"module":"GUI","glob":"CSS/DarkTheme.css"},{"module":"GUI","glob":"CSS/Label.css"},{"module":"GUI","glob":"CSS/LightTheme.css"},{"module":"GUI","glob":"CSS/ListView.css"},{"module":"GUI","glob":"CSS/Menu.css"},{"module":"GUI","glob":"CSS/ProgressBar.css"},{"module":"GUI","glob":"CSS/ScrollPane.css"},{"module":"GUI","glob":"CSS/TextField.css"},{"module":"GUI","glob":"CSS/VBox.css"},{"module":"GUI","glob":"Fonts/Monaco.ttf"},{"module":"GUI","glob":"Icons/AppIcon.png"},{"module":"GUI","glob":"Labels/AutoPaste.png"},{"module":"GUI","glob":"Labels/Directory.png"},{"module":"GUI","glob":"Labels/Filename.png"},{"module":"GUI","glob":"Labels/Link.png"},{"module":"GUI","glob":"SplashDark.png"},{"module":"java.base","glob":"jdk/internal/icu/impl/data/icudt74b/nfkc.nrm"},{"module":"java.base","glob":"jdk/internal/icu/impl/data/icudt74b/ubidi.icu"},{"module":"java.base","glob":"jdk/internal/icu/impl/data/icudt74b/uprops.icu"},{"module":"java.base","glob":"sun/net/idn/uidna.spp"},{"module":"java.xml","glob":"com/sun/org/apache/xml/internal/serializer/Encodings.properties"},{"module":"java.xml","glob":"com/sun/org/apache/xml/internal/serializer/XMLEntities.properties"},{"module":"java.xml","glob":"com/sun/org/apache/xml/internal/serializer/XMLEntities_en.properties"},{"module":"java.xml","glob":"com/sun/org/apache/xml/internal/serializer/XMLEntities_en_US.properties"},{"module":"java.xml","glob":"jdk/xml/internal/jdkcatalog/JDKCatalog.xml"},{"module":"javafx.controls","glob":"com/sun/javafx/scene/control/skin/modena/modena.bss"},{"module":"javafx.controls","glob":"com/sun/javafx/scene/control/skin/resources/controls.properties"},{"module":"javafx.controls","glob":"com/sun/javafx/scene/control/skin/resources/controls_en.properties"},{"module":"javafx.controls","glob":"com/sun/javafx/scene/control/skin/resources/controls_en_US.properties"},{"module":"javafx.graphics","glob":"com/sun/glass/utils/NativeLibLoader.class"},{"module":"javafx.graphics","glob":"com/sun/javafx/tk/quantum/QuantumMessagesBundle.properties"},{"module":"javafx.graphics","glob":"com/sun/javafx/tk/quantum/QuantumMessagesBundle_en.properties"},{"module":"javafx.graphics","glob":"com/sun/javafx/tk/quantum/QuantumMessagesBundle_en_US.properties"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/DrawPgram_Color.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/FillPgram_Color.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/FillPgram_LinearGradient_PAD.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/FillRoundRect_Color.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/Mask_TextureSuper.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/Solid_TextureFirstPassLCD.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/Solid_TextureRGB.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/Solid_TextureSecondPassLCD.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/Texture_Color.frag"},{"module":"javafx.graphics","glob":"com/sun/prism/es2/glsl/Texture_LinearGradient_PAD.frag"},{"module":"javafx.graphics","glob":"com/sun/scenario/effect/impl/es2/glsl/LinearConvolveShadow_28.frag"},{"module":"javafx.graphics","glob":"libglass.so"},{"module":"javafx.graphics","glob":"libglassgtk3.so"},{"module":"javafx.graphics","glob":"libjavafx_font.so"},{"module":"javafx.graphics","glob":"libjavafx_font_freetype.so"},{"module":"javafx.graphics","glob":"libjavafx_font_pango.so"},{"module":"javafx.graphics","glob":"libprism_es2.so"}]} diff --git a/pom.xml b/pom.xml index 91ef0ff94..67e6e6e43 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,8 @@ - 21 - 21 + 23 + 23 UTF-8 2.1.0 @@ -77,8 +77,8 @@ maven-compiler-plugin 3.13.0 - 21 - 21 + 23 + 23 From d722b6dde3f2516af7f03f890d80da1a7115d6a0 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Sat, 22 Feb 2025 13:09:34 +0530 Subject: [PATCH 2/5] fix: Fixed GluonFX build issue Signed-off-by: Saptarshi Sarkar --- .github/workflows/build.yml | 9 +++++++++ .github/workflows/docker-publish.yml | 9 +++++++++ docker-compose.yaml | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea7920946..7c1dddf27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,6 +98,7 @@ jobs: command: | Core/src/main/resources/yt-dlp.exe -U - name: Set up GraalVM JDK 23 + if: ${{ matrix.mode == 'CLI' }} uses: graalvm/setup-graalvm@v1 with: java-version: '23' @@ -105,6 +106,14 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} set-java-home: true cache: 'maven' + - name: Set up Gluon's GraalVM JDK 23 + if: ${{ matrix.mode == 'GUI' }} + uses: gluonhq/setup-graalvm@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + arch: ${{ matrix.os == 'macos-14' && 'aarch64' || 'x86_64' }} + jdk: 'java23' - name: Package Drifty CLI for ${{ matrix.os }} with GraalVM if: ${{ matrix.mode == 'CLI' }} shell: bash diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index f32027b20..172f1cce2 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -75,6 +75,7 @@ jobs: chmod +x Core/src/main/resources/yt-dlp Core/src/main/resources/yt-dlp -U - name: Set up GraalVM JDK 23 + if: ${{ matrix.docker_context == 'CLI' }} uses: graalvm/setup-graalvm@v1 with: java-version: '23' @@ -82,6 +83,14 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} set-java-home: true cache: 'maven' + - name: Set up Gluon's GraalVM JDK 23 + if: ${{ matrix.docker_context == 'GUI' }} + uses: gluonhq/setup-graalvm@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + arch: 'amd64' + jdk: 'java23' - name: Package Drifty CLI with GraalVM if: matrix.docker_context == 'CLI' run: mvn -P build-drifty-cli-for-ubuntu-latest package diff --git a/docker-compose.yaml b/docker-compose.yaml index b13ed846f..faa640360 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,7 +4,7 @@ services: context: . dockerfile: ./Docker/dev/commons/base/Dockerfile args: - - GRAALVM_VERSION_MAJOR=21 + - GRAALVM_VERSION_MAJOR=23 - MAVEN_MAJOR=3 - MAVEN_VERSION=3.8.8 container_name: drifty-base From 79b7ecb8bcf854ccaa22ee577455e8983131de01 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Sun, 23 Feb 2025 19:02:52 +0530 Subject: [PATCH 3/5] chore: Upgraded gluonfx-maven-plugin to 1.0.25 Signed-off-by: Saptarshi Sarkar --- CLI/pom.xml | 4 ++-- Core/pom.xml | 4 ++-- GUI/pom.xml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CLI/pom.xml b/CLI/pom.xml index c41326699..8cae69cc0 100644 --- a/CLI/pom.xml +++ b/CLI/pom.xml @@ -14,8 +14,8 @@ CLI module of Drifty - 21 - 21 + 23 + 23 UTF-8 main.Drifty_CLI diff --git a/Core/pom.xml b/Core/pom.xml index d4b19a127..ed0b62040 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -13,8 +13,8 @@ Core module of Drifty which includes the commonly used classes in Drifty CLI and GUI - 21 - 21 + 23 + 23 UTF-8 diff --git a/GUI/pom.xml b/GUI/pom.xml index 1decb294c..54eb98acf 100644 --- a/GUI/pom.xml +++ b/GUI/pom.xml @@ -13,8 +13,8 @@ GUI module of Drifty - 21 - 21 + 23 + 23 UTF-8 main.Drifty_GUI @@ -48,7 +48,7 @@ com.gluonhq gluonfx-maven-plugin - 1.0.23 + 1.0.25 true ${gui.main-class} From e2241422c34610a273c6f883a34e505bc3c144ff Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Tue, 4 Mar 2025 20:44:50 +0530 Subject: [PATCH 4/5] fix: Fixed windows build issue Signed-off-by: Saptarshi Sarkar --- GUI/pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/GUI/pom.xml b/GUI/pom.xml index 54eb98acf..0cff01383 100644 --- a/GUI/pom.xml +++ b/GUI/pom.xml @@ -15,6 +15,7 @@ 23 23 + 1.0.25 UTF-8 main.Drifty_GUI @@ -48,7 +49,7 @@ com.gluonhq gluonfx-maven-plugin - 1.0.25 + ${gluonfx-maven-plugin.version} true ${gui.main-class} @@ -125,6 +126,9 @@ build-drifty-gui-for-windows-latest + + 1.0.23 msi ${pom.parent.basedir}/config/missing_symbols-windows-latest.o resource-config-windows.json From 4415c903cdbc933a97772e11fa0193de4d2c5a20 Mon Sep 17 00:00:00 2001 From: Saptarshi Sarkar Date: Tue, 4 Mar 2025 21:34:34 +0530 Subject: [PATCH 5/5] fix(CI): Removed `pull-request-target` from docker prod ci Signed-off-by: Saptarshi Sarkar --- .github/workflows/docker-publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 172f1cce2..05f005301 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -6,7 +6,7 @@ on: paths-ignore: - "Website/**" - "*.md" - pull_request_target: + pull_request: paths-ignore: - "Website/**" - "*.md" @@ -70,7 +70,7 @@ jobs: sudo apt-get install libasound2-dev libavcodec-dev libavformat-dev libavutil-dev libfreetype6-dev sudo apt-get install libgl-dev libglib2.0-dev libgtk-3-dev libpango1.0-dev libx11-dev libxtst-dev zlib1g-dev - name: Update yt-dlp - if: ${{ github.event_name != 'pull_request_target' && github.repository == 'SaptarshiSarkar12/Drifty' && !contains(github.ref_name, 'dependabot') }} + if: ${{ github.event_name != 'pull_request' && github.repository == 'SaptarshiSarkar12/Drifty' && !contains(github.ref_name, 'dependabot') }} run: | chmod +x Core/src/main/resources/yt-dlp Core/src/main/resources/yt-dlp -U @@ -136,7 +136,7 @@ jobs: # https://github.com/docker/login-action - name: Log into registry uses: docker/login-action@v3.3.0 - if: github.event_name != 'pull_request_target' + if: github.event_name != 'pull_request' with: registry: ${{ env.REGISTRY }} username: ${{ github.repository_owner }} @@ -200,7 +200,7 @@ jobs: uses: docker/build-push-action@v6.12.0 with: context: build/${{ matrix.docker_context }} - push: ${{ github.event_name != 'pull_request_target' && github.repository == 'SaptarshiSarkar12/Drifty' && !contains(github.ref_name, 'dependabot') }} + push: ${{ github.event_name != 'pull_request' && github.repository == 'SaptarshiSarkar12/Drifty' && !contains(github.ref_name, 'dependabot') }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha