Skip to content

Commit 23dcf6a

Browse files
infeoinfeo
committed
Merge branch 'release/1.5.0'
2 parents e711c16 + b66f11c commit 23dcf6a

25 files changed

+380
-185
lines changed

‎.github/dependabot.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ updates:
1818
- "org.owasp:dependency-check-maven"
1919
- "org.sonatype.plugins:nexus-staging-maven-plugin"
2020
- "org.codehaus.mojo:exec-maven-plugin"
21+
- "io.github.coffeelibs:jextract-maven-plugin"
2122
java-production-dependencies:
2223
patterns:
2324
- "*"
@@ -28,11 +29,12 @@ updates:
2829
- "org.owasp:dependency-check-maven"
2930
- "org.sonatype.plugins:nexus-staging-maven-plugin"
3031
- "org.codehaus.mojo:exec-maven-plugin"
32+
- "io.github.coffeelibs:jextract-maven-plugin"
3133
- package-ecosystem: "github-actions"
3234
directory: "/" # even for `.github/workflows`
3335
schedule:
3436
interval: "monthly"
3537
groups:
3638
github-actions:
3739
patterns:
38-
- "*"
40+
- "*"

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/setup-java@v4
1818
with:
1919
distribution: 'temurin'
20-
java-version: 22
20+
java-version: 24
2121
cache: 'maven'
2222
- name: Ensure to use tagged version
2323
if: startsWith(github.ref, 'refs/tags/')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- uses: actions/setup-java@v4
2929
with:
3030
distribution: 'temurin'
31-
java-version: 22
31+
java-version: 24
3232
cache: 'maven'
3333
- name: Initialize CodeQL
3434
uses: github/codeql-action/init@v3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
runner-os: 'windows-latest'
1616
java-distribution: 'temurin'
17-
java-version: 22
17+
java-version: 24
1818
secrets:
1919
nvd-api-key: ${{ secrets.NVD_API_KEY }}
2020
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
19-
java-version: 22
19+
java-version: 24
2020
cache: 'maven'
2121
server-id: central
2222
server-username: MAVEN_CENTRAL_USERNAME

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
19-
java-version: 22
19+
java-version: 24
2020
cache: 'maven'
2121
- name: Enforce project version ${{ github.event.release.tag_name }}
2222
run: mvn versions:set -B -DnewVersion="${{ github.event.release.tag_name }}"

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

‎Makefile‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
# Note: make apparently thinks, that options specified with "/" are absolute paths and resolves them. see also https://stackoverflow.com/questions/17012419/d9024-make-unrecognized-source-file-type
2+
ARCH ?= x64
23
WIN_SDK_VERSION ?= 10.0.22621.0
34
MSVC_VERSION ?= 14.41.34120
45
HEADERS := -I"src\main\headers" \
56
-I"${JAVA_HOME}\include" \
67
-I"${JAVA_HOME}\include\win32" \
78
-I"C:\Program Files (x86)\Windows Kits\10\Include\$(WIN_SDK_VERSION)\cppwinrt"
89
SOURCES := $(wildcard src/main/native/*.cpp)
10+
OUT_DIR := target/$(ARCH)
11+
OUT_DLL := src/main/resources/integrations-$(ARCH).dll
12+
OUT_LIB := $(OUT_DIR)/integrations.lib
913

1014
########
1115

1216
all: install
1317

1418
install:
19+
ifeq "$(wildcard $(OUT_DIR))" ""
20+
mkdir "$(OUT_DIR)"
21+
endif
1522
cl -EHsc -std:c++17 -LD -W4 -guard:cf \
16-
-Fe"src/main/resources/integrations.dll" \
17-
-Fo"target/" \
23+
-Fe"$(OUT_DLL)" \
24+
-Fo"$(OUT_DIR)/" \
1825
$(HEADERS) $(SOURCES) \
1926
-link -NXCOMPAT -DYNAMICBASE \
20-
-implib:target/integrations.lib \
27+
-implib:$(OUT_LIB) \
2128
crypt32.lib shell32.lib ole32.lib uuid.lib user32.lib Advapi32.lib windowsapp.lib

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This project uses the following JVM properties:
1616

1717
* JDK 22
1818
* Maven
19-
* MSVC 2022 toolset (e.g. by installing Visual Studio 2022, Workset "Desktop development with C++")
19+
* MSVC 2022 toolset (e.g. by installing Visual Studio 2022, Workset "Desktop development with C++" and component "MSVC v143 VS 2022 C++ ARM64/ARM64EC-Buildtools")
2020
* Make (`choco install make`)
2121

2222
### Build

‎pom.xml‎

Lines changed: 51 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-win</artifactId>
8-
<version>1.4.2</version>
8+
<version>1.5.0</version>
99

1010
<name>Cryptomator Integrations for Windows</name>
1111
<description>Provides optional Windows services used by Cryptomator</description>
@@ -34,19 +34,21 @@
3434

3535
<properties>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
37-
<project.jdk.version>22</project.jdk.version>
37+
<project.jdk.version>24</project.jdk.version>
3838

3939
<!-- runtime dependencies -->
40-
<api.version>1.5.1</api.version>
40+
<api.version>1.6.0</api.version>
4141
<slf4j.version>2.0.17</slf4j.version>
42-
<jackson.version>2.18.3</jackson.version>
42+
<jackson.version>2.19.0</jackson.version>
4343

4444
<!-- test dependencies -->
45-
<junit.jupiter.version>5.12.0</junit.jupiter.version>
46-
<mockito.version>5.15.2</mockito.version>
45+
<junit.jupiter.version>5.12.2</junit.jupiter.version>
46+
<mockito.version>5.17.0</mockito.version>
4747

4848
<!-- build plugin dependencies -->
49-
<dependency-check.version>12.1.0</dependency-check.version>
49+
<mvn-surefire.version>3.5.3</mvn-surefire.version>
50+
<mvn-failsafe.version>3.5.3</mvn-failsafe.version>
51+
<dependency-check.version>12.1.1</dependency-check.version>
5052
<central-publishing.version>0.7.0</central-publishing.version>
5153
<jextract-maven.version>0.4.3</jextract-maven.version>
5254

@@ -121,6 +123,13 @@
121123
<include>*.h</include>
122124
</includes>
123125
</fileset>
126+
<fileset>
127+
<directory>${project.basedir}/src/main/resources</directory>
128+
<followSymlinks>false</followSymlinks>
129+
<includes>
130+
<include>*.dll</include>
131+
</includes>
132+
</fileset>
124133
</filesets>
125134
</configuration>
126135
</plugin>
@@ -198,7 +207,7 @@
198207
<plugin>
199208
<groupId>org.apache.maven.plugins</groupId>
200209
<artifactId>maven-surefire-plugin</artifactId>
201-
<version>3.5.2</version>
210+
<version>${mvn-surefire.version}</version>
202211
<dependencies>
203212
<dependency>
204213
<groupId>me.fabriciorby</groupId>
@@ -219,6 +228,19 @@
219228
<argLine>-javaagent:"${net.bytebuddy:byte-buddy-agent:jar}"</argLine>
220229
</configuration>
221230
</plugin>
231+
<plugin>
232+
<groupId>org.apache.maven.plugins</groupId>
233+
<artifactId>maven-failsafe-plugin</artifactId>
234+
<version>${mvn-failsafe.version}</version>
235+
<executions>
236+
<execution>
237+
<goals>
238+
<goal>integration-test</goal>
239+
<goal>verify</goal>
240+
</goals>
241+
</execution>
242+
</executions>
243+
</plugin>
222244
<plugin>
223245
<artifactId>maven-source-plugin</artifactId>
224246
<version>3.3.1</version>
@@ -336,24 +358,40 @@
336358
<groupId>org.codehaus.mojo</groupId>
337359
<artifactId>exec-maven-plugin</artifactId>
338360
<version>3.5.0</version>
361+
<configuration>
362+
<executable>cmd</executable>
363+
<workingDirectory>${project.basedir}</workingDirectory>
364+
<environmentVariables>
365+
<JAVA_HOME>${java.home}</JAVA_HOME>
366+
</environmentVariables>
367+
</configuration>
339368
<executions>
340369
<execution>
370+
<id>compile-x64</id>
341371
<goals>
342372
<goal>exec</goal>
343373
</goals>
344374
<phase>compile</phase>
345375
<configuration>
346-
<executable>cmd</executable>
347-
<workingDirectory>${project.basedir}</workingDirectory>
348-
<environmentVariables>
349-
<JAVA_HOME>${java.home}</JAVA_HOME>
350-
</environmentVariables>
351376
<arguments>
352377
<argument>/c</argument>
353378
<argument>"${devCommandFileDir}\vcvars64.bat" &amp;&amp; make install</argument>
354379
</arguments>
355380
</configuration>
356381
</execution>
382+
<execution>
383+
<id>compile-arm64</id>
384+
<goals>
385+
<goal>exec</goal>
386+
</goals>
387+
<phase>compile</phase>
388+
<configuration>
389+
<arguments>
390+
<argument>/c</argument>
391+
<argument>"${devCommandFileDir}\vcvarsamd64_arm64.bat" &amp;&amp; make install ARCH=arm64</argument>
392+
</arguments>
393+
</configuration>
394+
</execution>
357395
</executions>
358396
</plugin>
359397
</plugins>

0 commit comments

Comments
 (0)