Skip to content

Commit fa86175

Browse files
committed
Merge branch 'develop'
2 parents a6a6ecd + 08ee835 commit fa86175

File tree

24 files changed

+1057
-366
lines changed

24 files changed

+1057
-366
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/workflows/build-and-test.yml

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
pull_request:
1010
branches: [ master, develop ]
1111

12-
1312
jobs:
1413
build-on-linux:
1514
strategy:
@@ -21,23 +20,34 @@ jobs:
2120
distribution: [ 'zulu', 'adopt' ]
2221
runs-on: ${{ matrix.os }}
2322
steps:
24-
- uses: actions/checkout@v2
23+
- uses: actions/checkout@v4
2524
- name: Set up JDK ${{ matrix.java }}
2625
uses: actions/setup-java@v2
2726
with:
2827
java-version: ${{ matrix.java }}
2928
architecture: ${{ matrix.architecture }}
3029
distribution: ${{ matrix.distribution }}
31-
- name: Cache Gradle packages
32-
uses: actions/cache@v2
30+
cache: 'gradle'
31+
- name: Setup Gradle
32+
uses: gradle/actions/setup-gradle@v4
33+
- name: Build with Gradle
34+
run: ./gradlew build
35+
build-on-linux-native:
36+
runs-on: 'ubuntu-latest'
37+
steps:
38+
- uses: actions/checkout@v4
39+
- name: Set up GraalVM
40+
uses: graalvm/setup-graalvm@v1
3341
with:
34-
path: ~/.gradle/caches
35-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
36-
restore-keys: ${{ runner.os }}-gradle
37-
- name: Grant execute permission for gradlew
38-
run: chmod +x gradlew
42+
java-version: '17'
43+
distribution: 'graalvm'
44+
github-token: ${{ secrets.GITHUB_TOKEN }}
45+
native-image-job-reports: 'true'
46+
cache: 'gradle'
47+
- name: Setup Gradle
48+
uses: gradle/actions/setup-gradle@v4
3949
- name: Build with Gradle
40-
run: ./gradlew clean build
50+
run: ./gradlew nativeTest
4151
build-on-macos:
4252
strategy:
4353
matrix:
@@ -49,23 +59,19 @@ jobs:
4959
distribution: [ 'zulu', 'adopt' ]
5060
runs-on: ${{ matrix.os }}
5161
steps:
52-
- uses: actions/checkout@v2
62+
- uses: actions/checkout@v4
5363
- name: Set up JDK ${{ matrix.java }}
54-
uses: actions/setup-java@v2
64+
uses: actions/setup-java@v4
5565
with:
5666
java-version: ${{ matrix.java }}
5767
architecture: ${{ matrix.architecture }}
5868
distribution: ${{ matrix.distribution }}
59-
- name: Cache Gradle packages
60-
uses: actions/cache@v2
61-
with:
62-
path: ~/.gradle/caches
63-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
64-
restore-keys: ${{ runner.os }}-gradle
65-
- name: Grant execute permission for gradlew
66-
run: chmod +x gradlew
69+
cache: 'gradle'
70+
- name: Setup Gradle
71+
uses: gradle/actions/setup-gradle@v4
6772
- name: Build with Gradle
68-
run: ./gradlew clean build
73+
run: ./gradlew build
74+
6975
build-on-windows:
7076
strategy:
7177
matrix:
@@ -76,20 +82,15 @@ jobs:
7682
distribution: [ 'zulu', 'adopt' ]
7783
runs-on: ${{ matrix.os }}
7884
steps:
79-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v4
8086
- name: Set up JDK ${{ matrix.java }}
81-
uses: actions/setup-java@v1
87+
uses: actions/setup-java@v4
8288
with:
8389
java-version: ${{ matrix.java }}
8490
architecture: ${{ matrix.architecture }}
8591
distribution: ${{ matrix.distribution }}
86-
- name: Cache Gradle packages
87-
uses: actions/cache@v2
88-
with:
89-
path: ~/.gradle/caches
90-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
91-
restore-keys: ${{ runner.os }}-gradle
92-
- name: Grant execute permission for gradlew
93-
run: chmod +x gradlew
92+
cache: 'gradle'
93+
- name: Setup Gradle
94+
uses: gradle/actions/setup-gradle@v4
9495
- name: Build with Gradle
95-
run: ./gradlew clean build
96+
run: ./gradlew build

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 71 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
11
# Change Log
22

3-
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
3+
All notable changes to this project will be documented in this file.
4+
This project adheres to [Semantic Versioning](http://semver.org/).
5+
6+
## [2.12] - 2025-03-04
7+
8+
### Added
9+
10+
* Support for GraalVM `native-image`
11+
12+
### Changed
13+
14+
* Updated JNA to 5.16.0
415

516
## [2.11] - 2021-10-02
617

718
### Added
819

9-
* `argon2-jvm-nolibs` is now a multi-release JAR with a `module-info` file for Java >= 11. ([PR](https://github.com/phxql/argon2-jvm/pull/85))
20+
* `argon2-jvm-nolibs` is now a multi-release JAR with a `module-info` file for Java >=
21+
11. ([PR](https://github.com/phxql/argon2-jvm/pull/85))
1022
* Added support for context secrets and associated data ([PR](https://github.com/phxql/argon2-jvm/pull/86))
1123

1224
## [2.10.1] - 2021-04-06

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Without pre-compiled Argon2 libraries (recommended, install argon2 via your pack
1919
<dependency>
2020
<groupId>de.mkammerer</groupId>
2121
<artifactId>argon2-jvm-nolibs</artifactId>
22-
<version>2.11</version>
22+
<version>2.12</version>
2323
</dependency>
2424
```
2525

@@ -29,7 +29,7 @@ With pre-compiled Argon2 libraries:
2929
<dependency>
3030
<groupId>de.mkammerer</groupId>
3131
<artifactId>argon2-jvm</artifactId>
32-
<version>2.11</version>
32+
<version>2.12</version>
3333
</dependency>
3434
```
3535

@@ -38,13 +38,13 @@ With pre-compiled Argon2 libraries:
3838
Without pre-compiled Argon2 libraries (recommended, install argon2 via your package manager):
3939

4040
```groovy
41-
implementation 'de.mkammerer:argon2-jvm-nolibs:2.11'
41+
implementation 'de.mkammerer:argon2-jvm-nolibs:2.12'
4242
```
4343

4444
With pre-compiled Argon2 libraries:
4545

4646
```groovy
47-
implementation 'de.mkammerer:argon2-jvm:2.11'
47+
implementation 'de.mkammerer:argon2-jvm:2.12'
4848
```
4949

5050
## Usage
@@ -124,7 +124,7 @@ Licensed under [LGPL v3](https://www.gnu.org/licenses/lgpl.html).
124124

125125
## Maintainer
126126

127-
Moritz Kammerer ([@phXql](https://github.com/phxql))
127+
Moritz Halbritter ([@phXql](https://github.com/phxql))
128128

129129
## Contributing
130130

argon2-jvm-nolibs/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
plugins {
2-
id 'org.sonarqube' version '3.0'
3-
}
1+
apply plugin: 'java-library'
2+
apply plugin: 'org.sonarqube'
43

54
sourceSets {
65
java11 {
@@ -24,14 +23,14 @@ jar {
2423
}
2524

2625
dependencies {
27-
implementation 'net.java.dev.jna:jna:5.8.0'
26+
implementation 'net.java.dev.jna:jna:5.16.0'
2827
}
2928

3029
compileJava11Java {
3130
sourceCompatibility = 11
3231
targetCompatibility = 11
32+
options.release = 11
3333
options.compilerArgs.addAll([
34-
'--release', '11',
3534
'--module-path', sourceSets.main.compileClasspath.asPath,
3635
'--module-version', project.version]);
3736
}

0 commit comments

Comments
 (0)