Skip to content

Commit ca6b4d8

Browse files
purejavapurejava
committed
Merge branch 'develop' into new-secret-service
2 parents 17a4f69 + 69e58cb commit ca6b4d8

File tree

10 files changed

+117
-85
lines changed

10 files changed

+117
-85
lines changed

‎.github/workflows/build.yml‎

Lines changed: 85 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,110 @@
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:
1018
- uses: actions/checkout@v5
1119
- uses: actions/setup-java@v5
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: mvn 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: mvn -B verify --no-transfer-progress
29+
- name: Attest
30+
if: startsWith(github.ref, 'refs/tags/')
31+
uses: actions/attest-build-provenance@v3
32+
with:
33+
subject-path: |
34+
target/*.jar
35+
target/*.pom
36+
- uses: actions/upload-artifact@v5
2537
with:
2638
name: artifacts
2739
path: target/*.jar
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@v5
49+
- uses: actions/setup-java@v5
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: Verify project version matches tag
58+
if: startsWith(github.ref, 'refs/tags/')
59+
run: |
60+
PROJECT_VERSION=$(mvn help:evaluate "-Dexpression=project.version" -q -DforceStdout)
61+
test "$PROJECT_VERSION" = "${GITHUB_REF##*/}"
62+
- name: Deploy to Maven Central
63+
run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
64+
env:
65+
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
66+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
67+
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
68+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
69+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
70+
71+
deploy-github:
72+
name: Deploy to GitHub Packages
73+
runs-on: ubuntu-latest
74+
permissions:
75+
packages: write # Required for the deploy to GitHub Packages step
76+
needs: [build]
77+
if: github.repository_owner == 'cryptomator' && (startsWith(github.ref, 'refs/tags/') || contains(github.event.head_commit.message, '[deploy]'))
78+
steps:
79+
- uses: actions/checkout@v5
80+
- uses: actions/setup-java@v5
81+
with:
82+
java-version: ${{ env.JAVA_VERSION }}
83+
distribution: 'temurin'
84+
cache: 'maven'
85+
- name: Verify project version matches tag
86+
if: startsWith(github.ref, 'refs/tags/')
87+
run: |
88+
PROJECT_VERSION=$(mvn help:evaluate "-Dexpression=project.version" -q -DforceStdout)
89+
test "$PROJECT_VERSION" = "${GITHUB_REF##*/}"
90+
- name: Deploy to GitHub Packages
91+
run: mvn deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
92+
env:
93+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
94+
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
95+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
96+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}
97+
98+
release:
99+
name: Release
100+
runs-on: ubuntu-latest
101+
permissions:
102+
contents: write # Required for the release step
103+
needs: [deploy-central, deploy-github]
104+
if: startsWith(github.ref, 'refs/tags/')
105+
steps:
28106
- name: Create Release
29107
uses: softprops/action-gh-release@v2
30-
if: startsWith(github.ref, 'refs/tags/')
31108
with:
32109
prerelease: true
33110
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
- uses: actions/setup-java@v5
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@v4
2929
with:
3030
languages: java
3131
- name: Build
3232
run: mvn -B test
3333
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@v3
34+
uses: github/codeql-action/analyze@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
runner-os: 'ubuntu-latest'
1717
java-distribution: 'temurin'
18-
java-version: 24
18+
java-version: 25
1919
secrets:
2020
nvd-api-key: ${{ secrets.NVD_API_KEY }}
2121
ossindex-username: ${{ secrets.OSSINDEX_USERNAME }}

‎.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: 1 addition & 1 deletion
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:

‎.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.

‎CHANGELOG.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ 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-
## [Unreleased]
10+
## [Unreleased](https://github.com/cryptomator/integrations-linux/compare/1.6.1...HEAD)
1111

12-
No changes yet.
12+
* Require JDK 25
1313

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

1616
### Changed
1717

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ This library uses the following JVM properties:
99

1010
## Building Requirements
1111

12-
* JDK 24
12+
* JDK 25
1313
* Maven 3.9.6

‎pom.xml‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,46 @@
3636

3737
<properties>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39-
<project.jdk.version>24</project.jdk.version>
39+
<project.jdk.version>25</project.jdk.version>
4040

4141
<!-- runtime dependencies -->
4242

43-
<api.version>1.7.0</api.version>
43+
<api.version>1.8.0-SNAPSHOT</api.version>
4444
<secret-service.version>2.0.1-alpha</secret-service.version>
4545
<kdewallet.version>1.4.0</kdewallet.version>
4646
<secret-service-02.version>1.0.1</secret-service-02.version>
4747
<slf4j.version>2.0.17</slf4j.version>
4848
<appindicator.version>1.4.2</appindicator.version>
4949

5050
<!-- test dependencies -->
51-
<junit.version>5.13.4</junit.version>
51+
<junit.version>6.0.1</junit.version>
5252

5353
<!-- build plugin dependencies -->
54-
<mvn-compiler.version>3.14.0</mvn-compiler.version>
54+
<mvn-compiler.version>3.14.1</mvn-compiler.version>
5555
<mvn-surefire.version>3.5.4</mvn-surefire.version>
56-
<mvn-enforcer.version>3.6.1</mvn-enforcer.version>
56+
<mvn-enforcer.version>3.6.2</mvn-enforcer.version>
5757
<mvn-source.version>3.3.1</mvn-source.version>
58-
<mvn-javadoc.version>3.11.3</mvn-javadoc.version>
58+
<mvn-javadoc.version>3.12.0</mvn-javadoc.version>
5959
<mvn-gpg.version>3.2.8</mvn-gpg.version>
6060
<mvn-deploy.version>3.1.4</mvn-deploy.version>
61-
<dependency-check.version>12.1.3</dependency-check.version>
62-
<central-publishing.version>0.8.0</central-publishing.version>
61+
<dependency-check.version>12.1.8</dependency-check.version>
62+
<central-publishing.version>0.9.0</central-publishing.version>
6363
</properties>
6464

65+
<repositories>
66+
<repository>
67+
<name>Central Portal Snapshots</name>
68+
<id>central-portal-snapshots</id>
69+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
70+
<releases>
71+
<enabled>false</enabled>
72+
</releases>
73+
<snapshots>
74+
<enabled>true</enabled>
75+
</snapshots>
76+
</repository>
77+
</repositories>
78+
6579
<dependencies>
6680
<dependency>
6781
<groupId>org.cryptomator</groupId>

0 commit comments

Comments
 (0)