diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 8bc12fcb4..08b433ca9 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -50,7 +50,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' VERSION_NUM: ${{ inputs.semVerNum || '99.99.99'}} REVISION_NUM: ${{ inputs.revisionNum || '0' }} VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4061626ad..415888b02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: 25 + JAVA_VERSION: 26 defaults: run: diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 140120f4a..a6478a736 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -25,8 +25,8 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' - DEB_BUILD_DEPENDS: 'debhelper (>=10), openjdk-25-jdk (>= 25+36), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1' + JAVA_VERSION: '26.0.1+8' + DEB_BUILD_DEPENDS: 'debhelper (>=10), coffeelibs-jdk-26 (>= 26.0.1+8-0ppa1), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1' OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/25.0.2/openjfx-25.0.2_linux-x64_bin-jmods.zip' OPENJFX_JMODS_AMD64_HASH: 'e0a9c29d8cf3af9b8b48848b43f87b5785bc107c53a951b19668ce05842bba1b' OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/25.0.2/openjfx-25.0.2_linux-aarch64_bin-jmods.zip' @@ -56,6 +56,7 @@ jobs: fi - name: Install build tools run: | + sudo add-apt-repository -y ppa:coffeelibs/openjdk sudo apt-get update sudo apt-get install devscripts dput sudo apt-get satisfy "${DEB_BUILD_DEPENDS}" diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 4ffcb9ff1..49dee5b9c 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -11,7 +11,7 @@ jobs: with: runner-os: 'ubuntu-latest' java-distribution: 'temurin' - java-version: 25 + java-version: 26 secrets: nvd-api-key: ${{ secrets.NVD_API_KEY }} ossindex-username: ${{ secrets.OSSINDEX_USERNAME }} diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 57a93b7d9..390880d68 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -7,7 +7,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' defaults: run: diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml index def7ed98e..65358d62f 100644 --- a/.github/workflows/get-version.yml +++ b/.github/workflows/get-version.yml @@ -26,7 +26,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: 25 + JAVA_VERSION: 26 jobs: determine-version: diff --git a/.github/workflows/mac-dmg-x64.yml b/.github/workflows/mac-dmg-x64.yml index 550be16a8..5a635f2ce 100644 --- a/.github/workflows/mac-dmg-x64.yml +++ b/.github/workflows/mac-dmg-x64.yml @@ -56,7 +56,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' VERSION_NUM: ${{ inputs.semVerNum || '99.99.99'}} REVISION_NUM: ${{ inputs.revisionNum || '0' }} VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}} diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 683e5ab76..ce17bb970 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -54,7 +54,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: '25.0.2+10.0.LTS' + JAVA_VERSION: '26.0.1+8' VERSION_NUM: ${{ inputs.semVerNum || '99.99.99'}} REVISION_NUM: ${{ inputs.revisionNum || '0' }} VERSION_SUFFIX: ${{ inputs.semVerSuffix || ''}} diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index a0f6beefe..03837dcb3 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -5,7 +5,7 @@ on: env: JAVA_DIST: 'temurin' - JAVA_VERSION: 25 + JAVA_VERSION: 26 defaults: run: diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml index bae89301d..8ebef4dfd 100644 --- a/.github/workflows/release-check.yml +++ b/.github/workflows/release-check.yml @@ -12,7 +12,7 @@ defaults: env: JAVA_DIST: 'temurin' - JAVA_VERSION: 25 + JAVA_VERSION: 26 jobs: check-preconditions: diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index b8fd9ee02..5222a6a2c 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -83,7 +83,7 @@ jobs: - arch: x64 os: windows-latest java-dist: 'zulu' #cannot use temurin, see https://github.com/cryptomator/cryptomator/issues/3824#issuecomment-2829827427 - java-version: '25.0.1+8' + java-version: '26.0.1+8' java-package: 'jdk' steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 @@ -220,12 +220,10 @@ jobs: } $jar.Dispose() } - - name: Extract wixhelper.dll for Codesigning #see https://github.com/cryptomator/cryptomator/issues/3130 - shell: pwsh + - name: Get msi helper dll for code signing run: | - New-Item -Path appdir/jpackage-jmod -ItemType Directory - & $env:JAVA_HOME\bin\jmod.exe extract --dir jpackage-jmod "${env:JAVA_HOME}\jmods\jdk.jpackage.jmod" - Get-ChildItem -Recurse -Path "jpackage-jmod" -File wixhelper.dll | Select-Object -Last 1 | Copy-Item -Destination "appdir" + ${JAVA_HOME}/bin/jpackage --type msi --win-upgrade-uuid bda45523-42b1-4cae-9354-a45475ed4775 --app-image appdir/Cryptomator --dest /tmp/ --name Test --vendor Test --copyright "None" --app-version "1.0" --temp msi-helper + find ./msi-helper/ -type f -name msica.dll -exec mv {} ./appdir \; - name: Sign DLLs with Azure Trusted Signing if: inputs.sign || github.event_name == 'schedule' uses: ./.github/actions/win-sign-action @@ -261,6 +259,16 @@ jobs: "-Dlicense.failOnMissing=true" "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges" shell: pwsh + - name: Create file association file from template + working-directory: dist/win + run: | + $Env:JP_WIXWIZARD_RESOURCES_PROPERTIES_FORMAT = "${Env:JP_WIXWIZARD_RESOURCES}".Replace('\', '\\'); + Get-Content .\resources\FAvaultFile.template.properties ` + | ForEach-Object { $ExecutionContext.InvokeCommand.ExpandString($_) } ` + | Out-File -FilePath .\resources\FAvaultFile.properties + env: + JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources/ # requires abs path, used in resources/main.wxs + shell: pwsh - name: Create MSI run: > ${JAVA_HOME}/bin/jpackage @@ -276,14 +284,14 @@ jobs: --win-menu --win-dir-chooser --win-shortcut-prompt - --win-update-url "https:\\cryptomator.org\downloads" + --win-update-url "https://cryptomator.org/downloads" --win-menu-group Cryptomator --resource-dir dist/win/resources --license-file dist/win/resources/license.rtf --file-associations dist/win/resources/FAvaultFile.properties env: - JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs - JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir + JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources/ # requires abs path, used in resources/main.wxs + JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir\ - name: Sign MSI with Azure Trusted Signing if: inputs.sign || github.event_name == 'schedule' uses: ./.github/actions/win-sign-action diff --git a/dist/linux/debian/control b/dist/linux/debian/control index 713f03972..5d6535a4b 100644 --- a/dist/linux/debian/control +++ b/dist/linux/debian/control @@ -2,7 +2,7 @@ Source: cryptomator Maintainer: Cryptobot Section: utils Priority: optional -Build-Depends: debhelper (>=10), openjdk-25-jdk (>= 25+36), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1 +Build-Depends: debhelper (>=10), coffeelibs-jdk-26 (>= 26.0.1+8-0ppa1), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1 Standards-Version: 4.5.0 Homepage: https://cryptomator.org Vcs-Git: https://github.com/cryptomator/cryptomator.git diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index fc8937459..d2acc4cd4 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -4,12 +4,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +JAVA_HOME = /usr/lib/jvm/java-26-coffeelibs DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) ifeq ($(DEB_BUILD_ARCH),amd64) -JAVA_HOME = /usr/lib/jvm/java-25-openjdk-amd64 JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods else ifeq ($(DEB_BUILD_ARCH),arm64) -JAVA_HOME = /usr/lib/jvm/java-25-openjdk-arm64 JMODS_PATH = jmods/aarch64:${JAVA_HOME}/jmods endif diff --git a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml index 4d7c3f4d0..97aaefea4 100644 --- a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml +++ b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml @@ -150,14 +150,14 @@ modules: dest-filename: jdk.tar.gz only-arches: - x86_64 - url: https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.2%2B10/OpenJDK25U-jdk_x64_linux_hotspot_25.0.2_10.tar.gz - sha512: 29043fde119a031c2ca8d57aed445fedd9e7f74608fcdc7a809076ba84cfd1c31f08de2ecccf352e159fdcd1cae172395ed46363007552ff242057826c81ab3a + url: https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_x64_linux_hotspot_26.0.1_8.tar.gz + sha512: eb46cda97ffd46e2e0c1f6f977dc204d9cc969b958946287b7e7d0bfe859fd92faccb2f6ef79995421a963c6de140c436af559403e0a2cd27c90b06c20260d5c - type: file dest-filename: jdk.tar.gz only-arches: - aarch64 - url: https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.2%2B10/OpenJDK25U-jdk_aarch64_linux_hotspot_25.0.2_10.tar.gz - sha512: f1d3ccec3e1f1bed9d632f14b9223709d6e5c2e0d922125d068870dd3016492a2ca8f08924d4a9d0dc5eb2159fa09efee366a748fd0093475baf29e5c70c781a + url: https://github.com/adoptium/temurin26-binaries/releases/download/jdk-26.0.1%2B8/OpenJDK26U-jdk_aarch64_linux_hotspot_26.0.1_8.tar.gz + sha512: 3c31671552712a8f0df96df2eeae7e9ad5156c0e98ebd5bf4fa04c14bba58bd5e19ff567ddcdc7aa478f6f4b0a852762a09bd88d3132acb121e667cfe0397034 - type: file dest-filename: openjfx.zip only-arches: diff --git a/dist/linux/makepkg/PKGBUILD.template b/dist/linux/makepkg/PKGBUILD.template index e29a4396c..a7051a3d1 100644 --- a/dist/linux/makepkg/PKGBUILD.template +++ b/dist/linux/makepkg/PKGBUILD.template @@ -14,7 +14,7 @@ license=('GPL3') depends=('fuse3' 'alsa-lib' 'hicolor-icon-theme' 'libxtst' 'libnet' 'libxrender') makedepends=('maven' 'unzip') optdepends=('keepassxc-cryptomator: Use KeePassXC to store vault passwords' 'ttf-hanazono: Install this font when using Japanese system language') -_jdkver=25.0.2+10 +_jdkver=26.0.1+8 _jfxver=25.0.2 _src_app_dir=cryptomator-${pkgver//_/-} source=($SOURCES); @@ -24,9 +24,9 @@ source_aarch64=("jdk-${_jdkver}.tar.gz::https://github.com/adoptium/temurin${_jd "openjfx-${_jfxver}.zip::https://download2.gluonhq.com/openjfx/${_jfxver}/openjfx-${_jfxver}_linux-aarch64_bin-jmods.zip") noextract=("jdk-${_jdkver}.tar.gz" "openjfx-${_jfxver}.zip") sha256sums=($SOURCES_SHA) -sha256sums_x86_64=('987387933b64b9833846dee373b640440d3e1fd48a04804ec01a6dbf718e8ab8' +sha256sums_x86_64=('8e512f13e575a43655fc92319436c94890c137b9035cc6bd6f9cf24239704d3a' 'e0a9c29d8cf3af9b8b48848b43f87b5785bc107c53a951b19668ce05842bba1b') -sha256sums_aarch64=('a9d73e711d967dc44896d4f430f73a68fd33590dabc29a7f2fb9f593425b854c' +sha256sums_aarch64=('613f9b2861dea937b24d5eca745ef8567733b377d0bb612195acaad0e3f61360' 'c3408f818693cce09e59829a8e862a82c7695fdfcd585c41cfd527f5fc3fe646') options=('!strip') diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index cd5fa805d..1ac4bae5d 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -16,6 +16,19 @@ Param( # Function Definitions Section # ============================ +function Invoke-CommandWithExitCheck { + param ( + [string]$Command, + [string[]]$Arguments + ) + + & $Command @Arguments + if ($LASTEXITCODE -ne 0) { + Write-Error "Command '$Command' failed with exit code $LASTEXITCODE" + exit $LASTEXITCODE + } +} + function Main { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 @@ -65,7 +78,8 @@ Write-Host "`$Env:JAVA_HOME=$Env:JAVA_HOME" $copyright = "(C) $CopyrightStartYear - $((Get-Date).Year) $Vendor" # compile -&mvn -B -f $buildDir/../../pom.xml clean package -DskipTests -Pwin +Invoke-CommandWithExitCheck -Command ` + "mvn" -Arguments @("-B", "-f", "$buildDir/../../pom.xml", "clean", "package", "-DskipTests", "-Pwin") Copy-Item "$buildDir\..\..\target\$MainJarGlob.jar" -Destination "$buildDir\..\..\target\mods" # add runtime @@ -129,16 +143,18 @@ if ((& "$Env:JAVA_HOME\bin\jlink" --help | Select-String -Pattern "Linking from } ### create runtime -& "$Env:JAVA_HOME\bin\jlink" ` - --verbose ` - --output runtime ` - --module-path $jmodPaths ` - --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.crypto.mscapi,java.compiler,javafx.base,javafx.graphics,javafx.controls,javafx.fxml ` - --strip-native-commands ` - --no-header-files ` - --no-man-pages ` - --strip-debug ` - --compress "zip-0" #do not compress and use msi compression +Invoke-CommandWithExitCheck -Command ` + "$Env:JAVA_HOME\bin\jlink" -Arguments @( + "--verbose", + "--output", "runtime", + "--module-path", $jmodPaths, + "--add-modules", "java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.crypto.mscapi,java.compiler,javafx.base,javafx.graphics,javafx.controls,javafx.fxml", + "--strip-native-commands", + "--no-header-files", + "--no-man-pages", + "--strip-debug", + "--compress", "zip-0" #do not compress and use msi compression + ) $appPath = ".\$AppName" if ($clean -and (Test-Path -Path $appPath)) { @@ -195,14 +211,15 @@ if ($LASTEXITCODE -ne 0) { } #Create RTF license for msi -&mvn -B -f $buildDir/../../pom.xml license:add-third-party ` - "-Dlicense.thirdPartyFilename=license.rtf" ` - "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl" ` - "-Dlicense.outputDirectory=$buildDir\resources\" ` - "-Dlicense.includedScopes=compile" ` - "-Dlicense.excludedGroups=^org\.cryptomator" ` - "-Dlicense.failOnMissing=true" ` - "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges" +Invoke-CommandWithExitCheck -Command ` + "mvn" -Arguments @("-B", "-f", "$buildDir/../../pom.xml", "license:add-third-party", ` + "-Dlicense.thirdPartyFilename=license.rtf", ` + "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl", ` + "-Dlicense.outputDirectory=$buildDir\resources\", ` + "-Dlicense.includedScopes=compile", ` + "-Dlicense.excludedGroups=^org\.cryptomator", ` + "-Dlicense.failOnMissing=true", ` + "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges") # patch app dir Copy-Item "contrib\*" -Destination "$AppName" @@ -210,42 +227,46 @@ attrib -r "$AppName\$AppName.exe" attrib -r "$AppName\${AppName} (Debug).exe" # create .msi -$Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources" -$Env:JP_WIXHELPER_DIR = "." -& "$Env:JAVA_HOME\bin\jpackage" ` - --verbose ` - --type msi ` - --win-upgrade-uuid $UpgradeUUID ` - --app-image $AppName ` - --dest installer ` - --name $AppName ` - --vendor $Vendor ` - --copyright $copyright ` - --app-version "$semVerNo.$revisionNo" ` - --win-menu ` - --win-dir-chooser ` - --win-shortcut-prompt ` - --win-menu-group $AppName ` - --resource-dir resources ` - --license-file resources/license.rtf ` - --win-update-url $UpdateUrl ` - --about-url $AboutUrl ` - --file-associations resources/FAvaultFile.properties +$Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources\" +$Env:JP_WIXWIZARD_RESOURCES_PROPERTIES_FORMAT = "${Env:JP_WIXWIZARD_RESOURCES}".Replace('\', '\\'); +$Env:JP_WIXHELPER_DIR = "" -if ($LASTEXITCODE -ne 0) { - Write-Error "jpackage MSI failed with exit code $LASTEXITCODE" - return 1; -} +Get-Content .\resources\FAvaultFile.template.properties ` # Similar to envsubst + | ForEach-Object { $ExecutionContext.InvokeCommand.ExpandString($_) } ` + | Out-File -FilePath .\resources\FAvaultFile.properties + +Invoke-CommandWithExitCheck -Command ` + "$Env:JAVA_HOME\bin\jpackage" -Arguments @( + "--verbose", + "--type", "msi", + "--win-upgrade-uuid", $UpgradeUUID, + "--app-image", $AppName, + "--dest", "installer", + "--name", $AppName, + "--vendor", $Vendor, + "--copyright", $copyright, + "--app-version", "$semVerNo.$revisionNo", + "--win-menu", + "--win-dir-chooser", + "--win-shortcut-prompt", + "--win-menu-group", $AppName, + "--resource-dir", "resources", + "--license-file", "resources/license.rtf", + "--win-update-url", $UpdateUrl, + "--about-url", $AboutUrl, + "--file-associations", "resources/FAvaultFile.properties" + ) #Create RTF license for bundle -&mvn -B -f $buildDir/../../pom.xml license:add-third-party ` - "-Dlicense.thirdPartyFilename=license.rtf" ` - "-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl" ` - "-Dlicense.outputDirectory=$buildDir\bundle\resources\" ` - "-Dlicense.includedScopes=compile" ` - "-Dlicense.excludedGroups=^org\.cryptomator" ` - "-Dlicense.failOnMissing=true" ` - "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges" +Invoke-CommandWithExitCheck -Command ` + "mvn" -Arguments @("-B", "-f", "$buildDir/../../pom.xml", "license:add-third-party", ` + "-Dlicense.thirdPartyFilename=license.rtf", ` + "-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl", ` + "-Dlicense.outputDirectory=$buildDir\bundle\resources\", ` + "-Dlicense.includedScopes=compile", ` + "-Dlicense.excludedGroups=^org\.cryptomator", ` + "-Dlicense.failOnMissing=true", ` + "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges") # download Winfsp $winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi' @@ -271,18 +292,21 @@ Invoke-WebRequest $winfspUninstaller -OutFile ".\bundle\resources\winfsp-uninsta Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName.msi" -Force # create bundle including winfsp -& wix build ` - -define BundleName="$AppName" ` - -define BundleVersion="$semVerNo.$revisionNo" ` - -define BundleVendor="$Vendor" ` - -define BundleCopyright="$copyright" ` - -define AboutUrl="$AboutUrl" ` - -define HelpUrl="$HelpUrl" ` - -define UpdateUrl="$UpdateUrl" ` - -ext "WixToolset.Util.wixext" ` - -ext "WixToolset.BootstrapperApplications.wixext" ` - .\bundle\bundleWithWinfsp.wxs ` - -out "installer\$AppName-Installer.exe" +Invoke-CommandWithExitCheck -Command ` + "wix" -Arguments @( + "build", + "-define", "BundleName=$AppName", + "-define", "BundleVersion=$semVerNo.$revisionNo", + "-define", "BundleVendor=$Vendor", + "-define", "BundleCopyright=$copyright", + "-define", "AboutUrl=$AboutUrl", + "-define", "HelpUrl=$HelpUrl", + "-define", "UpdateUrl=$UpdateUrl", + "-ext", "WixToolset.Util.wixext", + "-ext", "WixToolset.BootstrapperApplications.wixext", + ".\bundle\bundleWithWinfsp.wxs", + "-out", ".\installer\$AppName-Installer.exe" +) Write-Host "Created EXE installer .\installer\$AppName-Installer.exe" return 0; diff --git a/dist/win/resources/FAvaultFile.properties b/dist/win/resources/FAvaultFile.properties index 4d0284e69..e35841acf 100644 --- a/dist/win/resources/FAvaultFile.properties +++ b/dist/win/resources/FAvaultFile.properties @@ -1,4 +1,4 @@ mime-type=application/vnd.cryptomator.vault extension=cryptomator description=Cryptomator Vault File -icon=resources/Cryptomator-Vault.ico \ No newline at end of file +icon=C:\\Users\\Arbeit\\Skymatic\\cryptomator-jdk26-jpackage\\dist\\win\\resources\\Cryptomator-Vault.ico diff --git a/dist/win/resources/FAvaultFile.template.properties b/dist/win/resources/FAvaultFile.template.properties new file mode 100644 index 000000000..39640a9ec --- /dev/null +++ b/dist/win/resources/FAvaultFile.template.properties @@ -0,0 +1,4 @@ +mime-type=application/vnd.cryptomator.vault +extension=cryptomator +description=Cryptomator Vault File +icon=${env:JP_WIXWIZARD_RESOURCES_PROPERTIES_FORMAT}Cryptomator-Vault.ico \ No newline at end of file diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs index 94cdd8cff..f9d6303e2 100644 --- a/dist/win/resources/main.wxs +++ b/dist/win/resources/main.wxs @@ -68,7 +68,7 @@ - + @@ -228,7 +228,7 @@ - - + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 93123869e..d03b5bda6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ UTF-8 - 25 + 26 diff --git a/suppression.xml b/suppression.xml index bb1ff3f9b..8dc9fbe87 100644 --- a/suppression.xml +++ b/suppression.xml @@ -100,6 +100,24 @@ cpe:/a:flatpak:flatpak + + + ^pkg:maven/org\.eclipse\.jetty/jetty-.*$ + CVE-2026-2332 + CVE-2026-2332 + + + + + ^pkg:maven/org\.eclipse\.jetty/jetty-.*$ + CVE-2026-5795 + CVE-2026-5795 + +