Skip to content

Commit f345c5b

Browse files
overheadhunteroverheadhunter
committed
Merge branch 'release/1.3.1'
2 parents a930c10 + c652ee2 commit f345c5b

File tree

6 files changed

+36
-72
lines changed

6 files changed

+36
-72
lines changed

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ jobs:
77
build:
88
name: Build and Test
99
runs-on: macos-latest
10-
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
1110
steps:
1211
- uses: actions/checkout@v4
1312
- uses: actions/setup-java@v4

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

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,28 @@
11
name: Publish to Maven Central
22
on:
3-
workflow_dispatch:
4-
inputs:
5-
tag:
6-
description: 'Tag'
7-
required: true
8-
default: '0.0.0'
3+
release:
4+
types: [published]
95
jobs:
106
publish:
117
runs-on: macos-latest
8+
if: startsWith(github.ref, 'refs/tags/') # only allow publishing tagged versions
129
steps:
1310
- uses: actions/checkout@v4
14-
with:
15-
ref: "refs/tags/${{ github.event.inputs.tag }}"
1611
- uses: actions/setup-java@v4
1712
with:
1813
distribution: 'temurin'
1914
java-version: 17
2015
cache: 'maven'
21-
server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
22-
server-username: MAVEN_USERNAME # env variable for username in deploy
23-
server-password: MAVEN_PASSWORD # env variable for token in deploy
24-
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
25-
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
26-
- name: Enforce project version ${{ github.event.inputs.tag }}
27-
run: mvn versions:set -B -DnewVersion=${{ github.event.inputs.tag }}
16+
server-id: central
17+
server-username: MAVEN_CENTRAL_USERNAME
18+
server-password: MAVEN_CENTRAL_PASSWORD
19+
- name: Enforce project version ${{ github.event.release.tag_name }}
20+
run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}
2821
- name: Deploy
2922
run: mvn deploy -B -DskipTests -Psign,deploy-central --no-transfer-progress
3023
env:
31-
MAVEN_OPTS: >
32-
--add-opens=java.base/java.util=ALL-UNNAMED
33-
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
34-
--add-opens=java.base/java.text=ALL-UNNAMED
35-
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
36-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
37-
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
38-
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
24+
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
25+
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
26+
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
27+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
28+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

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

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,12 @@ jobs:
1313
distribution: 'temurin'
1414
java-version: 17
1515
cache: 'maven'
16-
gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
17-
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
1816
- name: Enforce project version ${{ github.event.release.tag_name }}
1917
run: mvn versions:set -B -DnewVersion=${{ github.event.release.tag_name }}
2018
- name: Deploy
2119
run: mvn deploy -B -DskipTests -Psign,deploy-github --no-transfer-progress
2220
env:
2321
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2422
MAVEN_GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
25-
notify:
26-
runs-on: ubuntu-latest
27-
needs: [publish]
28-
steps:
29-
- name: Slack Notification
30-
uses: rtCamp/action-slack-notify@v2
31-
env:
32-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
33-
SLACK_USERNAME: 'Cryptobot'
34-
SLACK_ICON:
35-
SLACK_ICON_EMOJI: ':bot:'
36-
SLACK_CHANNEL: 'cryptomator-desktop'
37-
SLACK_TITLE: "Published ${{ github.event.repository.name }} ${{ github.event.release.tag_name }}"
38-
SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions/workflows/publish-central.yml|deploy to Maven Central>."
39-
SLACK_FOOTER:
40-
MSG_MINIMAL: true
23+
MAVEN_GPG_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
24+
MAVEN_GPG_KEY_FINGERPRINT: ${{ vars.RELEASES_GPG_KEY_FINGERPRINT }}

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ macOS-specific implementations of [integrations-api](https://github.com/cryptoma
44

55
## Building
66

7-
Since this project involves JNI, you'll Java as well as Xcode build tools:
7+
Since this project involves JNI, you need Java as well as Xcode build tools:
88

99
* JDK 17
1010
* Maven
11-
* XCode Command Line Tools (run `xcode-select --install`)
11+
* XCode Command Line Tools (run `xcode-select --install`)

‎pom.xml‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-mac</artifactId>
8-
<version>1.3.0</version>
8+
<version>1.3.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+
1314
<scm>
1415
<connection>scm:git:[email protected]:cryptomator/integrations-mac.git</connection>
1516
<developerConnection>scm:git:[email protected]:cryptomator/integrations-mac.git</developerConnection>
16-
<url>git@github.com:cryptomator/integrations-mac.git</url>
17+
<url>https://github.com/cryptomator/integrations-mac</url>
1718
</scm>
19+
1820
<developers>
1921
<developer>
2022
<name>Sebastian Stenzel</name>
@@ -30,16 +32,16 @@
3032
<project.jdk.version>17</project.jdk.version>
3133

3234
<!-- runtime dependencies -->
33-
<api.version>1.5.0</api.version>
34-
<slf4j.version>2.0.16</slf4j.version>
35+
<api.version>1.5.1</api.version>
36+
<slf4j.version>2.0.17</slf4j.version>
3537

3638
<!-- test dependencies -->
37-
<junit.jupiter.version>5.11.4</junit.jupiter.version>
39+
<junit.jupiter.version>5.12.0</junit.jupiter.version>
3840
<mockito.version>5.15.2</mockito.version>
3941

4042
<!-- build plugin dependencies -->
41-
<dependency-check.version>11.1.1</dependency-check.version>
42-
<nexus-staging.version>1.7.0</nexus-staging.version>
43+
<dependency-check.version>12.1.0</dependency-check.version>
44+
<central-publishing.version>0.7.0</central-publishing.version>
4345
</properties>
4446

4547
<licenses>
@@ -88,7 +90,7 @@
8890
<plugin>
8991
<groupId>org.apache.maven.plugins</groupId>
9092
<artifactId>maven-clean-plugin</artifactId>
91-
<version>3.4.0</version>
93+
<version>3.4.1</version>
9294
<configuration>
9395
<filesets>
9496
<fileset>
@@ -104,7 +106,7 @@
104106
<plugin>
105107
<groupId>org.apache.maven.plugins</groupId>
106108
<artifactId>maven-compiler-plugin</artifactId>
107-
<version>3.13.0</version>
109+
<version>3.14.0</version>
108110
<configuration>
109111
<compilerArgs>
110112
<arg>-h</arg>
@@ -286,7 +288,7 @@
286288
<skipTestScope>true</skipTestScope>
287289
<detail>true</detail>
288290
<suppressionFile>suppression.xml</suppressionFile>
289-
<nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
291+
<nvdApiKeyEnvironmentVariable>NVD_API_KEY</nvdApiKeyEnvironmentVariable>
290292
</configuration>
291293
<executions>
292294
<execution>
@@ -316,10 +318,7 @@
316318
<goal>sign</goal>
317319
</goals>
318320
<configuration>
319-
<gpgArguments>
320-
<arg>--pinentry-mode</arg>
321-
<arg>loopback</arg>
322-
</gpgArguments>
321+
<signer>bc</signer>
323322
</configuration>
324323
</execution>
325324
</executions>
@@ -330,24 +329,16 @@
330329

331330
<profile>
332331
<id>deploy-central</id>
333-
<distributionManagement>
334-
<repository>
335-
<id>ossrh</id>
336-
<name>Maven Central</name>
337-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
338-
</repository>
339-
</distributionManagement>
340332
<build>
341333
<plugins>
342334
<plugin>
343-
<groupId>org.sonatype.plugins</groupId>
344-
<artifactId>nexus-staging-maven-plugin</artifactId>
345-
<version>${nexus-staging.version}</version>
335+
<groupId>org.sonatype.central</groupId>
336+
<artifactId>central-publishing-maven-plugin</artifactId>
337+
<version>${central-publishing.version}</version>
346338
<extensions>true</extensions>
347339
<configuration>
348-
<serverId>ossrh</serverId>
349-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
350-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
340+
<publishingServerId>central</publishingServerId>
341+
<autoPublish>true</autoPublish>
351342
</configuration>
352343
</plugin>
353344
</plugins>
@@ -368,7 +359,7 @@
368359
<plugin>
369360
<groupId>org.apache.maven.plugins</groupId>
370361
<artifactId>maven-deploy-plugin</artifactId>
371-
<version>3.1.3</version>
362+
<version>3.1.4</version>
372363
</plugin>
373364
</plugins>
374365
</build>

‎src/main/resources/MacIntegrationsBundle_en.properties‎

Whitespace-only changes.

0 commit comments

Comments
 (0)