Skip to content

Commit 723514f

Browse files
infeoinfeo
committed
Merge branch 'release/1.7.0'
2 parents e4cb938 + f35ed80 commit 723514f

25 files changed

Lines changed: 1213 additions & 107 deletions

‎.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: 94 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,116 @@
11
name: Build
22
on:
33
push:
4+
pull_request_target:
5+
types: [labeled]
6+
7+
env:
8+
JAVA_VERSION: 25
49

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

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

Lines changed: 6 additions & 6 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@v5
19+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020
with:
2121
fetch-depth: 2
22-
- uses: actions/setup-java@v5
22+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2323
with:
2424
distribution: 'temurin'
25-
java-version: 24
25+
java-version: 25
2626
cache: 'maven'
2727
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@v3
28+
uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
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@v3
34+
uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,19 @@ 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+
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@957d3c2c08c56855fdac41e5afb9a7aca8c30dd9 # v3.0.3
1415
with:
1516
runner-os: 'ubuntu-latest'
1617
java-distribution: 'temurin'
17-
java-version: 24
18+
java-version: 25
1819
secrets:
1920
nvd-api-key: ${{ secrets.NVD_API_KEY }}
20-
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
21+
ossindex-username: ${{ secrets.OSSINDEX_USERNAME }}
22+
ossindex-token: ${{ secrets.OSSINDEX_API_TOKEN }}
23+
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_CRYPTOMATOR_DESKTOP }}

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

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

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

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

‎.github/workflows/pullrequest.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
env:
77
JAVA_DIST: 'temurin'
8-
JAVA_VERSION: 24
8+
JAVA_VERSION: 25
99

1010
defaults:
1111
run:
@@ -16,12 +16,12 @@ jobs:
1616
name: Compile and Test
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v5
20-
- uses: actions/setup-java@v5
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

‎.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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
77
The changelog starts with version 1.6.1.
88
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/integrations-linux/releases).
99

10-
## [1.6.1] - 2025-09-17
10+
## [1.7.0](https://github.com/cryptomator/integrations-linux/releases/1.7.0) - 2026-03-12
11+
12+
### Added
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+
1117

1218
### Changed
19+
* Require JDK 25
20+
* Pin GitHub action versions used in CI ([#132](https://github.com/cryptomator/integrations-linux/pull/132))
21+
* Updated dependency `com.fasterxml.jackson.core:jackson-databind` from 2.20.0 to 2.21.1
22+
1323

24+
## [1.6.1](https://github.com/cryptomator/integrations-linux/releases/tag/1.6.1) - 2025-09-17
25+
26+
### Changed
1427
* Updated `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
1528
* Refactor Dolphin quick access integration for robustness (#114)
1629

1730
### Fixed
18-
1931
* Remove stale bookmarks in Dolphin quick access (#114)
2032

2133

0 commit comments

Comments
 (0)