Skip to content

Commit

Permalink
Merge pull request #1 from Zylquinal/java-20
Browse files Browse the repository at this point in the history
- Second Preview of Panama Project (Java 20) support.
- API rewrite to its final form
  • Loading branch information
Zylquinal authored Mar 25, 2023
2 parents 53c5bb8 + 1587286 commit 473c3a5
Show file tree
Hide file tree
Showing 35 changed files with 4,188 additions and 1,459 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- uses: actions/checkout@v3
- name: 'Set up JDK 19'
- name: 'Set up JDK 20'
uses: oracle-actions/setup-java@v1
with:
website: jdk.java.net
release: 19
release: 20
- name: Build with Gradle
uses: gradle/gradle-build-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class Example {

rawHash = ArgonContext.builder()
.password("password".getBytes())
.salt("randomsalt")
.salt("randomsalt".getBytes())
.memoryCost(65536)
.iterations(2)
.parallelism(1)
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

group 'com.zylquinal.argon2'
version '1.1-SNAPSHOT'
version '2.0-SNAPSHOT'

repositories {
mavenCentral()
Expand All @@ -14,18 +14,20 @@ dependencies {
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testImplementation 'de.mkammerer:argon2-jvm:2.11'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'

}

tasks.withType(JavaCompile) {
tasks.withType(JavaCompile).configureEach {
options.compilerArgs += "--enable-preview"
}

tasks.withType(Test) {
tasks.withType(Test).configureEach {
jvmArgs += "--enable-preview"
}

tasks.withType(JavaExec) {
tasks.withType(JavaExec).configureEach {
jvmArgs += "--enable-preview"
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 1 addition & 4 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
jdk:
- openjdk19
before_install:
- sdk install java 19.0.2-open
- sdk use java 19.0.2-open
- openjdk20
Loading

0 comments on commit 473c3a5

Please sign in to comment.