Skip to content

Commit a2ab803

Browse files
infeoinfeo
committed
Merge release/1.4.1 into main
2 parents b384450 + 9e30f85 commit a2ab803

File tree

9 files changed

+168
-90
lines changed

9 files changed

+168
-90
lines changed

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ updates:
1616
patterns:
1717
- "org.apache.maven.plugins:*"
1818
- "org.owasp:dependency-check-maven"
19-
- "org.sonatype.plugins:nexus-staging-maven-plugin"
19+
- "org.sonatype.central:central-publishing-maven-plugin"
2020
- "org.codehaus.mojo:exec-maven-plugin"
2121
java-production-dependencies:
2222
patterns:
@@ -26,7 +26,7 @@ updates:
2626
- "org.mockito:*"
2727
- "org.apache.maven.plugins:*"
2828
- "org.owasp:dependency-check-maven"
29-
- "org.sonatype.plugins:nexus-staging-maven-plugin"
29+
- "org.sonatype.central:central-publishing-maven-plugin"
3030
- "org.codehaus.mojo:exec-maven-plugin"
3131
- package-ecosystem: "github-actions"
3232
directory: "/" # even for `.github/workflows`

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
name: Build and Test
99
runs-on: macos-latest
1010
steps:
11-
- uses: actions/checkout@v4
12-
- uses: actions/setup-java@v4
11+
- uses: actions/checkout@v5
12+
- uses: actions/setup-java@v5
1313
with:
1414
distribution: 'temurin'
1515
java-version: 24
@@ -33,3 +33,5 @@ jobs:
3333
prerelease: true
3434
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
3535
generate_release_notes: true
36+
body: |
37+
For a list of all notable changes, read the [changelog](/CHANGELOG.md).

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ 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@v4
19+
- uses: actions/checkout@v5
2020
with:
2121
fetch-depth: 2
22-
- uses: actions/setup-java@v4
22+
- uses: actions/setup-java@v5
2323
with:
2424
distribution: 'temurin'
2525
java-version: 24

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
runs-on: macos-latest
88
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
99
steps:
10-
- uses: actions/checkout@v4
11-
- uses: actions/setup-java@v4
10+
- uses: actions/checkout@v5
11+
- uses: actions/setup-java@v5
1212
with:
1313
distribution: 'temurin'
1414
java-version: 24

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ jobs:
77
runs-on: macos-latest
88
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
99
steps:
10-
- uses: actions/checkout@v4
11-
- uses: actions/setup-java@v4
10+
- uses: actions/checkout@v5
11+
- uses: actions/setup-java@v5
1212
with:
1313
distribution: 'temurin'
1414
java-version: 24

‎CHANGELOG.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
6+
7+
The changelog starts with version 1.4.1.
8+
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/integrations-mac/releases).
9+
10+
## [1.4.1] - 2025-09-18
11+
### Added
12+
13+
* Added translation for Ukrainian (uk). (#81)
14+
15+
### Changed
16+
17+
* Updated `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
18+
19+
### Fixed
20+
21+
* Guard NSStrings from being nil in native code. (#80)
22+
23+

‎pom.xml‎

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-mac</artifactId>
8-
<version>1.4.0</version>
8+
<version>1.4.1</version>
99

1010
<name>Cryptomator Integrations for macOS</name>
1111
<description>Provides optional macOS services used by Cryptomator</description>
1212
<url>https://github.com/cryptomator/integrations-mac</url>
13-
13+
1414
<scm>
1515
<connection>scm:git:[email protected]:cryptomator/integrations-mac.git</connection>
1616
<developerConnection>scm:git:[email protected]:cryptomator/integrations-mac.git</developerConnection>
@@ -32,16 +32,27 @@
3232
<project.jdk.version>24</project.jdk.version>
3333

3434
<!-- runtime dependencies -->
35-
<api.version>1.6.0</api.version>
35+
<api.version>1.7.0</api.version>
3636
<slf4j.version>2.0.17</slf4j.version>
3737

3838
<!-- test dependencies -->
39-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
40-
<mockito.version>5.17.0</mockito.version>
39+
<junit.jupiter.version>5.13.4</junit.jupiter.version>
40+
<mockito.version>5.19.0</mockito.version>
4141

4242
<!-- build plugin dependencies -->
43-
<dependency-check.version>12.1.1</dependency-check.version>
44-
<central-publishing.version>0.7.0</central-publishing.version>
43+
<mvn-clean.version>3.5.0</mvn-clean.version>
44+
<mvn-compiler.version>3.14.0</mvn-compiler.version>
45+
<mvn-dependency.version>3.8.1</mvn-dependency.version>
46+
<mvn-deploy.version>3.1.4</mvn-deploy.version>
47+
<mvn-enforcer.version>3.6.1</mvn-enforcer.version>
48+
<mvn-javadoc.version>3.11.3</mvn-javadoc.version>
49+
<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>
52+
<mvn-surefire.version>3.5.4</mvn-surefire.version>
53+
<central-publishing.version>0.8.0</central-publishing.version>
54+
<dependency-check.version>12.1.3</dependency-check.version>
55+
<exec-maven.version>3.5.1</exec-maven.version>
4556
</properties>
4657

4758
<licenses>
@@ -90,7 +101,7 @@
90101
<plugin>
91102
<groupId>org.apache.maven.plugins</groupId>
92103
<artifactId>maven-clean-plugin</artifactId>
93-
<version>3.4.1</version>
104+
<version>${mvn-clean.version}</version>
94105
<configuration>
95106
<filesets>
96107
<fileset>
@@ -106,7 +117,7 @@
106117
<plugin>
107118
<groupId>org.apache.maven.plugins</groupId>
108119
<artifactId>maven-compiler-plugin</artifactId>
109-
<version>3.14.0</version>
120+
<version>${mvn-compiler.version}</version>
110121
<configuration>
111122
<compilerArgs>
112123
<arg>-h</arg>
@@ -118,7 +129,7 @@
118129
<plugin>
119130
<groupId>org.apache.maven.plugins</groupId>
120131
<artifactId>maven-enforcer-plugin</artifactId>
121-
<version>3.5.0</version>
132+
<version>${mvn-enforcer.version}</version>
122133
<executions>
123134
<execution>
124135
<id>check-preconditions</id>
@@ -144,10 +155,23 @@
144155
</execution>
145156
</executions>
146157
</plugin>
158+
<plugin>
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-dependency-plugin</artifactId>
161+
<version>${mvn-dependency.version}</version>
162+
<executions>
163+
<execution>
164+
<id>jar-paths-to-properties</id>
165+
<goals>
166+
<goal>properties</goal>
167+
</goals>
168+
</execution>
169+
</executions>
170+
</plugin>
147171
<plugin>
148172
<groupId>org.codehaus.mojo</groupId>
149173
<artifactId>exec-maven-plugin</artifactId>
150-
<version>3.5.0</version>
174+
<version>${exec-maven.version}</version>
151175
<executions>
152176
<execution>
153177
<id>xcode-build-intel</id>
@@ -225,7 +249,7 @@
225249
</plugin>
226250
<plugin>
227251
<artifactId>maven-resources-plugin</artifactId>
228-
<version>3.3.1</version>
252+
<version>${mvn-resources.version}</version>
229253
<executions>
230254
<execution>
231255
<goals>
@@ -249,11 +273,14 @@
249273
<plugin>
250274
<groupId>org.apache.maven.plugins</groupId>
251275
<artifactId>maven-surefire-plugin</artifactId>
252-
<version>3.5.3</version>
276+
<version>${mvn-surefire.version}</version>
277+
<configuration>
278+
<argLine>-javaagent:"${org.mockito:mockito-core:jar}"</argLine>
279+
</configuration>
253280
</plugin>
254281
<plugin>
255282
<artifactId>maven-source-plugin</artifactId>
256-
<version>3.3.1</version>
283+
<version>${mvn-source.version}</version>
257284
<executions>
258285
<execution>
259286
<id>attach-sources</id>
@@ -265,7 +292,7 @@
265292
</plugin>
266293
<plugin>
267294
<artifactId>maven-javadoc-plugin</artifactId>
268-
<version>3.11.2</version>
295+
<version>${mvn-javadoc.version}</version>
269296
<executions>
270297
<execution>
271298
<id>attach-javadocs</id>
@@ -357,7 +384,7 @@
357384
<plugins>
358385
<plugin>
359386
<artifactId>maven-gpg-plugin</artifactId>
360-
<version>3.2.7</version>
387+
<version>${mvn-gpg.version}</version>
361388
<executions>
362389
<execution>
363390
<id>sign-artifacts</id>
@@ -407,7 +434,7 @@
407434
<plugin>
408435
<groupId>org.apache.maven.plugins</groupId>
409436
<artifactId>maven-deploy-plugin</artifactId>
410-
<version>3.1.4</version>
437+
<version>${mvn-deploy.version}</version>
411438
</plugin>
412439
</plugins>
413440
</build>

0 commit comments

Comments
 (0)