diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5e792ef0a..be3ba6a19 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,10 @@ updates: ignore: - dependency-name: "org.cryptomator:integrations-api" versions: ["2.0.0-alpha1"] + - dependency-name: "jakarta.inject:jakarta.inject-api" + versions: ["2.0.1.MR"] + - dependency-name: "org.openjfx:*" + update-types: ["version-update:semver-major"] groups: java-test-dependencies: patterns: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e86b61ea..f07eecae7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,10 +53,25 @@ jobs: generate_release_notes: true body: |- :construction: Work in Progress + ### What's New 🎉 - ⏳ Please be patient, the builds are still [running](https://github.com/cryptomator/cryptomator/actions). New versions of Cryptomator can be found here in a few moments. ⏳ + ### Bugfixes 🐛 - As usual, the GPG signatures can be checked using [our public key `5811 7AFA 1F85 B3EE C154 677D 615D 449F E6E6 A235`](https://gist.github.com/cryptobot/211111cf092037490275f39d408f461a). + ### Other Changes 📎 --- - \ No newline at end of file + + TODO FULL CHANGELOG + + 📜 List of closed issues is available [here](TODO) + + --- + ⏳ Please be patient, the builds are still [running](https://github.com/cryptomator/cryptomator/actions). New versions of Cryptomator can be found here in a few moments. ⏳ + + + + As usual, the GPG signatures can be checked using [our public key `5811 7AFA 1F85 B3EE C154 677D 615D 449F E6E6 A235`](https://gist.github.com/cryptobot/211111cf092037490275f39d408f461a). diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index fdfda1f71..8bb6347bc 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -32,17 +32,15 @@ jobs: fail-fast: false matrix: include: - - os: macos-12 + - os: macos-15-large architecture: x64 output-suffix: x64 - xcode-path: '/Applications/Xcode_13.2.1.app' fuse-lib: macFUSE openjfx-url: 'https://download2.gluonhq.com/openjfx/22.0.2/openjfx-22.0.2_osx-x64_bin-jmods.zip' openjfx-sha: '115cb08bb59d880cfff6e51e0bf0dcc45785ed9d456b8b8425597b04da6ab3d4' - - os: [self-hosted, macOS, ARM64] + - os: macos-15 architecture: aarch64 output-suffix: arm64 - xcode-path: '/Applications/Xcode_13.2.1.app' fuse-lib: FUSE-T openjfx-url: 'https://download2.gluonhq.com/openjfx/22.0.2/openjfx-22.0.2_osx-aarch64_bin-jmods.zip' openjfx-sha: '813c6748f7c99cb7a579d48b48a087b4682b1fad1fc1a4fe5f9b21cf872b15a7' @@ -240,7 +238,7 @@ jobs: apple-id: ${{ secrets.MACOS_NOTARIZATION_APPLE_ID }} password: ${{ secrets.MACOS_NOTARIZATION_PW }} team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }} - xcode-path: ${{ matrix.xcode-path }} + xcode-path: '/Applications/Xcode_16.app' - name: Add possible alpha/beta tags to installer name run: mv Cryptomator-*.dmg Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg - name: Create detached GPG signature with key 615D449FE6E6A235 diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 18834c0fc..655ed6260 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -14,22 +14,23 @@