Skip to content

Commit 67fd23e

Browse files
committed
Merge branch 'develop' into release/1.5.0
2 parents 880a48f + 4d9455b commit 67fd23e

13 files changed

Lines changed: 570 additions & 45 deletions

.github/workflows/build.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,41 @@ jobs:
1414
permissions:
1515
id-token: write # Required for the attestations step
1616
attestations: write # Required for the attestations step
17+
contents: read
1718
steps:
18-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
19-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
19+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2021
with:
2122
distribution: 'temurin'
2223
java-version: ${{ env.JAVA_VERSION }}
2324
cache: 'maven'
2425
- name: Ensure to use tagged version
2526
if: startsWith(github.ref, 'refs/tags/')
26-
run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
27+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
2728
- name: Build and Test
28-
run: mvn -B verify --no-transfer-progress
29+
run: ./mvnw -B verify --no-transfer-progress
2930
- name: Attest
3031
if: startsWith(github.ref, 'refs/tags/')
31-
uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0
32+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
3233
with:
3334
subject-path: |
3435
target/*.jar
3536
target/*.pom
36-
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
37+
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
3738
with:
3839
name: artifacts
3940
path: target/*.jar
4041

4142
deploy-central:
4243
name: Deploy to Maven Central
4344
runs-on: macos-latest
44-
permissions: {}
45+
permissions:
46+
contents: read
4547
needs: [build]
4648
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
4749
steps:
48-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
49-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
50+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
51+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
5052
with:
5153
distribution: 'temurin'
5254
java-version: ${{ env.JAVA_VERSION }}
@@ -56,14 +58,14 @@ jobs:
5658
server-password: MAVEN_CENTRAL_PASSWORD
5759
- name: Ensure to use tagged version
5860
if: startsWith(github.ref, 'refs/tags/')
59-
run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
61+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
6062
- name: Verify project version is -SNAPSHOT
6163
if: startsWith(github.ref, 'refs/tags/') == false
6264
run: |
63-
PROJECT_VERSION=$(mvn help:evaluate "-Dexpression=project.version" -q -DforceStdout)
65+
PROJECT_VERSION=$(./mvnw help:evaluate "-Dexpression=project.version" -q -DforceStdout)
6466
test "${PROJECT_VERSION: -9}" = "-SNAPSHOT"
6567
- name: Deploy to Maven Central
66-
run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
68+
run: ./mvnw deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
6769
env:
6870
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
6971
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
@@ -76,25 +78,26 @@ jobs:
7678
runs-on: macos-latest
7779
permissions:
7880
packages: write # Required for the deploy to GitHub Packages step
81+
contents: read
7982
needs: [build]
8083
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
8184
steps:
82-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
83-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
85+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
86+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
8487
with:
8588
java-version: ${{ env.JAVA_VERSION }}
8689
distribution: 'temurin'
8790
cache: 'maven'
8891
- name: Ensure to use tagged version
8992
if: startsWith(github.ref, 'refs/tags/')
90-
run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
93+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
9194
- name: Verify project version is -SNAPSHOT
9295
if: startsWith(github.ref, 'refs/tags/') == false
9396
run: |
94-
PROJECT_VERSION=$(mvn help:evaluate "-Dexpression=project.version" -q -DforceStdout)
97+
PROJECT_VERSION=$(./mvnw help:evaluate "-Dexpression=project.version" -q -DforceStdout)
9598
test "${PROJECT_VERSION: -9}" = "-SNAPSHOT"
9699
- name: Deploy to GitHub Packages
97-
run: mvn deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
100+
run: ./mvnw deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
98101
env:
99102
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100103
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}

.github/workflows/codeql-analysis.yml

Lines changed: 8 additions & 5 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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
22+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2023
with:
2124
fetch-depth: 2
22-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
25+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2326
with:
2427
distribution: 'temurin'
2528
java-version: 25
2629
cache: 'maven'
2730
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
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@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
37+
uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6

.github/workflows/dependency-check.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ on:
1111

1212
jobs:
1313
check-dependencies:
14-
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@1074588008ae3326a2221ea451783280518f0366 # v3.0.1
14+
permissions:
15+
contents: read
16+
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@957d3c2c08c56855fdac41e5afb9a7aca8c30dd9 # v3.0.3
1517
with:
1618
runner-os: 'macos-latest'
1719
java-distribution: 'temurin'
@@ -20,4 +22,4 @@ jobs:
2022
nvd-api-key: ${{ secrets.NVD_API_KEY }}
2123
ossindex-username: ${{ secrets.OSSINDEX_USERNAME }}
2224
ossindex-token: ${{ secrets.OSSINDEX_API_TOKEN }}
23-
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
25+
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_CRYPTOMATOR_DESKTOP }}
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: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +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+
1011
## [Unreleased](https://github.com/cryptomator/integrations-mac/compare/1.4.1...HEAD)
1112

1213
### Added
13-
+ DMG Update Mechanism (#92)
14+
+ DMG Update Mechanism ([#92](https://github.com/cryptomator/integrations-mac/pull/92))
1415

1516
### Changed
1617
* Require JDK 25
17-
* Pin GitHub action versions used in CI (#97)
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+
1823

1924
## [1.4.1](https://github.com/cryptomator/integrations-mac/releases/tag/1.4.1) - 2025-09-18
2025
### Added
21-
2226
* Added translation for Ukrainian (uk). (#81)
2327

2428
### Changed
25-
2629
* Updated `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
2730

2831
### Fixed
29-
3032
* Guard NSStrings from being nil in native code. (#80)
3133

3234

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ macOS-specific implementations of [integrations-api](https://github.com/cryptoma
77
Since this project involves JNI, you need Java as well as Xcode build tools:
88

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

0 commit comments

Comments
 (0)