Skip to content

Commit 9b0391c

Browse files
committed
Merge branch 'develop' into release/1.7.0
2 parents d3807c2 + a4e7a8d commit 9b0391c

17 files changed

Lines changed: 813 additions & 39 deletions

.github/workflows/build.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ jobs:
1515
id-token: write # Required for the attestations step
1616
attestations: write # Required for the attestations step
1717
steps:
18-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
19-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
18+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2020
with:
2121
distribution: 'temurin'
2222
java-version: ${{ env.JAVA_VERSION }}
2323
cache: 'maven'
2424
- name: Ensure to use tagged version
2525
if: startsWith(github.ref, 'refs/tags/')
26-
run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
26+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
2727
- name: Build and Test
28-
run: mvn -B verify --no-transfer-progress
28+
run: ./mvnw -B verify --no-transfer-progress
2929
- name: Attest
3030
if: startsWith(github.ref, 'refs/tags/')
31-
uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0
31+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
3232
with:
3333
subject-path: |
3434
target/*.jar
@@ -45,8 +45,8 @@ jobs:
4545
needs: [build]
4646
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
4747
steps:
48-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
49-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
48+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
5050
with:
5151
distribution: 'temurin'
5252
java-version: ${{ env.JAVA_VERSION }}
@@ -56,14 +56,14 @@ jobs:
5656
server-password: MAVEN_CENTRAL_PASSWORD
5757
- name: Ensure to use tagged version
5858
if: startsWith(github.ref, 'refs/tags/')
59-
run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
59+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
6060
- name: Verify project version is -SNAPSHOT
6161
if: startsWith(github.ref, 'refs/tags/') == false
6262
run: |
63-
PROJECT_VERSION=$(mvn help:evaluate "-Dexpression=project.version" -q -DforceStdout)
63+
PROJECT_VERSION=$(./mvnw help:evaluate "-Dexpression=project.version" -q -DforceStdout)
6464
test "${PROJECT_VERSION: -9}" = "-SNAPSHOT"
6565
- name: Deploy to Maven Central
66-
run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
66+
run: ./mvnw deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
6767
env:
6868
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
6969
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
@@ -79,22 +79,22 @@ jobs:
7979
needs: [build]
8080
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
8181
steps:
82-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
83-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
82+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
83+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
8484
with:
8585
java-version: ${{ env.JAVA_VERSION }}
8686
distribution: 'temurin'
8787
cache: 'maven'
8888
- name: Ensure to use tagged version
8989
if: startsWith(github.ref, 'refs/tags/')
90-
run: mvn versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
90+
run: ./mvnw versions:set --file ./pom.xml -DnewVersion=${GITHUB_REF##*/}
9191
- name: Verify project version is -SNAPSHOT
9292
if: startsWith(github.ref, 'refs/tags/') == false
9393
run: |
94-
PROJECT_VERSION=$(mvn help:evaluate "-Dexpression=project.version" -q -DforceStdout)
94+
PROJECT_VERSION=$(./mvnw help:evaluate "-Dexpression=project.version" -q -DforceStdout)
9595
test "${PROJECT_VERSION: -9}" = "-SNAPSHOT"
9696
- name: Deploy to GitHub Packages
97-
run: mvn deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
97+
run: ./mvnw deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
9898
env:
9999
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100100
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
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)) }}
1818
steps:
19-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
19+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020
with:
2121
fetch-depth: 2
22-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
22+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2323
with:
2424
distribution: 'temurin'
2525
java-version: 25
2626
cache: 'maven'
2727
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
28+
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
2929
with:
3030
languages: java
3131
- name: Build
32-
run: mvn -B test
32+
run: ./mvnw -B test
3333
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
34+
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0

.github/workflows/dependency-check.yml

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

1212
jobs:
1313
check-dependencies:
14-
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@2d0c27a7b04c605afe1ca85e37c0e86517defcc9 # v3.0.2
14+
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@957d3c2c08c56855fdac41e5afb9a7aca8c30dd9 # v3.0.3
1515
with:
1616
runner-os: 'ubuntu-latest'
1717
java-distribution: 'temurin'
@@ -20,4 +20,4 @@ jobs:
2020
nvd-api-key: ${{ secrets.NVD_API_KEY }}
2121
ossindex-username: ${{ secrets.OSSINDEX_USERNAME }}
2222
ossindex-token: ${{ secrets.OSSINDEX_API_TOKEN }}
23-
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
23+
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_CRYPTOMATOR_DESKTOP }}

.github/workflows/pullrequest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
name: Compile and Test
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
20-
- 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
2121
with:
2222
distribution: ${{ env.JAVA_DIST }}
2323
java-version: ${{ env.JAVA_VERSION }}
2424
cache: 'maven'
2525
- name: Build and Test
2626
id: buildAndTest
27-
run: mvn -B clean verify
27+
run: ./mvnw -B clean verify
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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,24 @@ Changes to prior versions can be found on the [Github release page](https://gith
1010
## [Unreleased](https://github.com/cryptomator/integrations-linux/compare/1.6.1...HEAD)
1111

1212
### Added
13-
* Flatpak Update Mechanism (#117)
13+
* Flatpak Update Mechanism ([#117](https://github.com/cryptomator/integrations-linux/pull/117))
14+
* New KeychainAccess service implementation based on freedesktop secret-service DBus API ([#125](https://github.com/cryptomator/integrations-linux/pull/125))
15+
* Use Maven wrapper for building ([#140](https://github.com/cryptomator/integrations-linux/pull/140))
16+
1417

1518
### Changed
1619
* Require JDK 25
1720
* Pin GitHub action versions used in CI ([#132](https://github.com/cryptomator/integrations-linux/pull/132))
18-
* Updated dependency `com.fasterxml.jackson.core:jackson-databind` from 2.20.0 to 2.20.1
21+
* Updated dependency `com.fasterxml.jackson.core:jackson-databind` from 2.20.0 to 2.21.0
22+
1923

2024
## [1.6.1](https://github.com/cryptomator/integrations-linux/releases/tag/1.6.1) - 2025-09-17
2125

2226
### Changed
23-
2427
* Updated `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
2528
* Refactor Dolphin quick access integration for robustness (#114)
2629

2730
### Fixed
28-
2931
* Remove stale bookmarks in Dolphin quick access (#114)
3032

3133

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
# integrations-linux
2-
Linux-specific implemenations of the [integrations-api](https://github.com/cryptomator/integrations-api).
2+
Linux-specific implementations of the [integrations-api](https://github.com/cryptomator/integrations-api).
33

44
# Config
55

66
This library uses the following JVM properties:
77
* `cryptomator.integrationsLinux.trayIconsDir` - specifies the directory from which svg images for the tray icon are loaded
88
* `cryptomator.integrationsLinux.autoStartCmd` - specifies the command used for starting Cryptomator
99

10-
## Building Requirements
10+
## Build
11+
12+
### Requirements
1113

1214
* JDK 25
13-
* Maven 3.9.6
15+
16+
### Execution
17+
```
18+
./mvnw verify
19+
```

0 commit comments

Comments
 (0)