Skip to content

Commit d1d808e

Browse files
infeoinfeo
committed
Merge branch 'release/1.5.0'
2 parents a2ab803 + 9ff3b30 commit d1d808e

35 files changed

+900
-118
lines changed

‎.github/dependabot.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ updates:
77
day: "monday"
88
time: "06:00"
99
timezone: "Etc/UTC"
10+
ignore:
11+
- dependency-name: "org.cryptomator:integrations-api"
12+
versions: [ "2.0.0-alpha1" ]
1013
groups:
1114
java-test-dependencies:
1215
patterns:

‎.github/workflows/build.yml‎

Lines changed: 96 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,117 @@ on:
33
push:
44
pull_request_target:
55
types: [labeled]
6+
7+
env:
8+
JAVA_VERSION: 25
9+
610
jobs:
711
build:
812
name: Build and Test
913
runs-on: macos-latest
14+
permissions:
15+
id-token: write # Required for the attestations step
16+
attestations: write # Required for the attestations step
17+
contents: read
1018
steps:
11-
- uses: actions/checkout@v5
12-
- uses: actions/setup-java@v5
19+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
1321
with:
1422
distribution: 'temurin'
15-
java-version: 24
23+
java-version: ${{ env.JAVA_VERSION }}
1624
cache: 'maven'
1725
- name: Ensure to use tagged version
1826
if: startsWith(github.ref, 'refs/tags/')
19-
shell: bash
20-
run: |
21-
mvn -B versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
27+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
2228
- name: Build and Test
23-
id: buildAndTest
24-
run: mvn -B clean install
25-
- uses: actions/upload-artifact@v4
29+
run: ./mvnw -B verify --no-transfer-progress
30+
- name: Attest
31+
if: startsWith(github.ref, 'refs/tags/')
32+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
33+
with:
34+
subject-path: |
35+
target/*.jar
36+
target/*.pom
37+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
2638
with:
2739
name: artifacts
2840
path: target/*.jar
29-
- name: Create Release
30-
uses: softprops/action-gh-release@v2
41+
42+
deploy-central:
43+
name: Deploy to Maven Central
44+
runs-on: macos-latest
45+
permissions:
46+
contents: read
47+
needs: [build]
48+
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
49+
steps:
50+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
51+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
52+
with:
53+
distribution: 'temurin'
54+
java-version: ${{ env.JAVA_VERSION }}
55+
cache: 'maven'
56+
server-id: central
57+
server-username: MAVEN_CENTRAL_USERNAME
58+
server-password: MAVEN_CENTRAL_PASSWORD
59+
- name: Ensure to use tagged version
3160
if: startsWith(github.ref, 'refs/tags/')
61+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
62+
- name: Verify project version is -SNAPSHOT
63+
if: startsWith(github.ref, 'refs/tags/') == false
64+
run: |
65+
PROJECT_VERSION=$(./mvnw help:evaluate "-Dexpression=project.version" -q -DforceStdout)
66+
test "${PROJECT_VERSION: -9}" = "-SNAPSHOT"
67+
- name: Deploy to Maven Central
68+
run: ./mvnw deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
69+
env:
70+
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
71+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
72+
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
73+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
74+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
75+
76+
deploy-github:
77+
name: Deploy to GitHub Packages
78+
runs-on: macos-latest
79+
permissions:
80+
packages: write # Required for the deploy to GitHub Packages step
81+
contents: read
82+
needs: [build]
83+
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
84+
steps:
85+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
86+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
87+
with:
88+
java-version: ${{ env.JAVA_VERSION }}
89+
distribution: 'temurin'
90+
cache: 'maven'
91+
- name: Ensure to use tagged version
92+
if: startsWith(github.ref, 'refs/tags/')
93+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
94+
- name: Verify project version is -SNAPSHOT
95+
if: startsWith(github.ref, 'refs/tags/') == false
96+
run: |
97+
PROJECT_VERSION=$(./mvnw help:evaluate "-Dexpression=project.version" -q -DforceStdout)
98+
test "${PROJECT_VERSION: -9}" = "-SNAPSHOT"
99+
- name: Deploy to GitHub Packages
100+
run: ./mvnw deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
101+
env:
102+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
103+
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
104+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
105+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
106+
107+
release:
108+
name: Release
109+
runs-on: ubuntu-latest
110+
permissions:
111+
contents: write # Required for the release step
112+
needs: [deploy-central, deploy-github]
113+
if: startsWith(github.ref, 'refs/tags/')
114+
steps:
115+
- name: Create Release
116+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
32117
with:
33118
prerelease: true
34119
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,23 @@ jobs:
1515
runs-on: macos-latest
1616
# dependeabot has on push events only read-only access, but codeql requires write access
1717
if: ${{ !(github.actor == 'dependabot[bot]' && contains(fromJSON('["push"]'), github.event_name)) }}
18+
permissions:
19+
contents: read
20+
security-events: write
1821
steps:
19-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2023
with:
2124
fetch-depth: 2
22-
- uses: actions/setup-java@v5
25+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2326
with:
2427
distribution: 'temurin'
25-
java-version: 24
28+
java-version: 25
2629
cache: 'maven'
2730
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@v3
31+
uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
2932
with:
3033
languages: java
3134
- name: Build
32-
run: mvn -B compile
35+
run: ./mvnw -B compile
3336
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@v3
37+
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6

‎.github/workflows/dependency-check.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,21 @@ on:
55
push:
66
branches:
77
- 'release/**'
8+
- 'hotfix/**'
89
workflow_dispatch:
910

1011

1112
jobs:
1213
check-dependencies:
13-
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@v1
14+
permissions:
15+
contents: read
16+
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@957d3c2c08c56855fdac41e5afb9a7aca8c30dd9 # v3.0.3
1417
with:
1518
runner-os: 'macos-latest'
1619
java-distribution: 'temurin'
17-
java-version: 24
20+
java-version: 25
1821
secrets:
1922
nvd-api-key: ${{ secrets.NVD_API_KEY }}
20-
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
23+
ossindex-username: ${{ secrets.OSSINDEX_USERNAME }}
24+
ossindex-token: ${{ secrets.OSSINDEX_API_TOKEN }}
25+
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_CRYPTOMATOR_DESKTOP }}

‎.github/workflows/publish-central.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎.github/workflows/publish-github.yml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
wrapperVersion=3.3.4
2+
distributionType=only-script
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
4+
distributionSha256Sum=305773a68d6ddfd413df58c82b3f8050e89778e777f3a745c8e5b8cbea4018ef

‎CHANGELOG.md‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,28 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
77
The changelog starts with version 1.4.1.
88
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/integrations-mac/releases).
99

10-
## [1.4.1] - 2025-09-18
10+
11+
## [1.5.0](https://github.com/cryptomator/integrations-mac/releases/1.5.0)
12+
1113
### Added
14+
+ DMG Update Mechanism ([#92](https://github.com/cryptomator/integrations-mac/pull/92))
15+
16+
### Changed
17+
* Require JDK 25
18+
* Pin GitHub action versions used in CI ([#97](https://github.com/cryptomator/integrations-mac/pull/97))
19+
20+
### Fixed
21+
* OpenCmdRevealPathService opened two Finder windows when path parameter is a directory ([#109](https://github.com/cryptomator/integrations-mac/pull/109))
22+
1223

24+
## [1.4.1](https://github.com/cryptomator/integrations-mac/releases/tag/1.4.1) - 2025-09-18
25+
### Added
1326
* Added translation for Ukrainian (uk). (#81)
1427

1528
### Changed
16-
1729
* Updated `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
1830

1931
### Fixed
20-
2132
* Guard NSStrings from being nil in native code. (#80)
2233

2334

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ macOS-specific implementations of [integrations-api](https://github.com/cryptoma
66

77
Since this project involves JNI, you need Java as well as Xcode build tools:
88

9-
* JDK 24
10-
* Maven
9+
* JDK 25
1110
* XCode Command Line Tools (run `xcode-select --install`)

0 commit comments

Comments
 (0)