Skip to content

Commit 80b0d5e

Browse files
infeoinfeo
committed
Merge branch 'develop' into release/1.5.0
2 parents 8412eea + bbb217b commit 80b0d5e

21 files changed

+98
-35
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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
id-token: write # Required for the attestations step
1616
attestations: write # Required for the attestations step
1717
steps:
18-
- uses: actions/checkout@v5
19-
- uses: actions/setup-java@v5
18+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
19+
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
2020
with:
2121
distribution: 'temurin'
2222
java-version: ${{ env.JAVA_VERSION }}
@@ -28,12 +28,12 @@ jobs:
2828
run: mvn -B verify --no-transfer-progress
2929
- name: Attest
3030
if: startsWith(github.ref, 'refs/tags/')
31-
uses: actions/attest-build-provenance@v3
31+
uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0
3232
with:
3333
subject-path: |
3434
target/*.jar
3535
target/*.pom
36-
- uses: actions/upload-artifact@v5
36+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
3737
with:
3838
name: artifacts
3939
path: 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@v5
49-
- uses: actions/setup-java@v5
48+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
49+
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
5050
with:
5151
distribution: 'temurin'
5252
java-version: ${{ env.JAVA_VERSION }}
@@ -79,8 +79,8 @@ 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@v5
83-
- uses: actions/setup-java@v5
82+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
83+
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
8484
with:
8585
java-version: ${{ env.JAVA_VERSION }}
8686
distribution: 'temurin'
@@ -110,7 +110,7 @@ jobs:
110110
if: startsWith(github.ref, 'refs/tags/')
111111
steps:
112112
- name: Create Release
113-
uses: softprops/action-gh-release@v2
113+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
114114
with:
115115
prerelease: true
116116
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}

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

Lines changed: 4 additions & 4 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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2020
with:
2121
fetch-depth: 2
22-
- uses: actions/setup-java@v5
22+
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
2323
with:
2424
distribution: 'temurin'
2525
java-version: 25
2626
cache: 'maven'
2727
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@v4
28+
uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
2929
with:
3030
languages: java
3131
- name: Build
3232
run: mvn -B compile
3333
- name: Perform CodeQL Analysis
34-
uses: github/codeql-action/analyze@v4
34+
uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9

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

Lines changed: 1 addition & 1 deletion
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@v3
14+
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@1074588008ae3326a2221ea451783280518f0366 # v3.0.1
1515
with:
1616
runner-os: 'macos-latest'
1717
java-distribution: 'temurin'

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Changes to prior versions can be found on the [Github release page](https://gith
1414

1515
### Changed
1616
* Require JDK 25
17+
* Pin GitHub action versions used in CI (#97)
1718

1819
## [1.4.1](https://github.com/cryptomator/integrations-mac/releases/tag/1.4.1) - 2025-09-18
1920
### Added

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
<!-- test dependencies -->
3939
<junit.jupiter.version>6.0.1</junit.jupiter.version>
40-
<mockito.version>5.20.0</mockito.version>
40+
<mockito.version>5.21.0</mockito.version>
4141

4242
<!-- build plugin dependencies -->
4343
<mvn-clean.version>3.5.0</mvn-clean.version>
@@ -47,12 +47,12 @@
4747
<mvn-enforcer.version>3.6.2</mvn-enforcer.version>
4848
<mvn-javadoc.version>3.12.0</mvn-javadoc.version>
4949
<mvn-gpg.version>3.2.8</mvn-gpg.version>
50-
<mvn-resources.version>3.3.1</mvn-resources.version>
51-
<mvn-source.version>3.3.1</mvn-source.version>
50+
<mvn-resources.version>3.4.0</mvn-resources.version>
51+
<mvn-source.version>3.4.0</mvn-source.version>
5252
<mvn-surefire.version>3.5.4</mvn-surefire.version>
5353
<central-publishing.version>0.9.0</central-publishing.version>
54-
<dependency-check.version>12.1.8</dependency-check.version>
55-
<exec-maven.version>3.6.2</exec-maven.version>
54+
<dependency-check.version>12.1.9</dependency-check.version>
55+
<exec-maven.version>3.6.3</exec-maven.version>
5656
</properties>
5757

5858
<licenses>

‎src/main/resources/MacIntegrationsBundle_da.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
org.cryptomator.macos.keychain.displayName=macOS nøglering
2-
org.cryptomator.macos.keychain.touchIdDisplayName=Fingeraftryk ID
2+
org.cryptomator.macos.keychain.touchIdDisplayName=Fingeraftryk ID
3+
org.cryptomator.macos.update.dmg.displayName=Download .dmg fil
4+
org.cryptomator.macos.update.dmg.unpacking=Udpakker...
5+
org.cryptomator.macos.update.dmg.verifying=Verificerer...
6+
org.cryptomator.macos.update.dmg.restarting=Genstarter...

‎src/main/resources/MacIntegrationsBundle_de.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
org.cryptomator.macos.keychain.displayName=macOS-Schlüsselbund
2-
org.cryptomator.macos.keychain.touchIdDisplayName=Touch ID
2+
org.cryptomator.macos.keychain.touchIdDisplayName=Touch ID
3+
org.cryptomator.macos.update.dmg.displayName=.dmg-Datei herunterladen
4+
org.cryptomator.macos.update.dmg.unpacking=Entpacken...
5+
org.cryptomator.macos.update.dmg.verifying=Überprüfen...
6+
org.cryptomator.macos.update.dmg.restarting=Starte neu...

‎src/main/resources/MacIntegrationsBundle_es.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
org.cryptomator.macos.keychain.displayName=macOS Keychain
2-
org.cryptomator.macos.keychain.touchIdDisplayName=Touch ID
2+
org.cryptomator.macos.keychain.touchIdDisplayName=Touch ID
3+
org.cryptomator.macos.update.dmg.displayName=Descargar archivo .dmg
4+
org.cryptomator.macos.update.dmg.unpacking=Desempaquetando...
5+
org.cryptomator.macos.update.dmg.verifying=Verificando...
6+
org.cryptomator.macos.update.dmg.restarting=Reiniciando...

‎src/main/resources/MacIntegrationsBundle_fi.properties‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
org.cryptomator.macos.keychain.displayName=macOS avainnippu
2-
org.cryptomator.macos.keychain.touchIdDisplayName=Touch ID
2+
org.cryptomator.macos.keychain.touchIdDisplayName=Touch ID
3+
org.cryptomator.macos.update.dmg.displayName=Lataa .dmg-tiedosto
4+
org.cryptomator.macos.update.dmg.unpacking=Puretaan...
5+
org.cryptomator.macos.update.dmg.verifying=Tarkistetaan...
6+
org.cryptomator.macos.update.dmg.restarting=Käynnistetään uudelleen...

0 commit comments

Comments
 (0)