Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions .github/workflows/dokka-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,10 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ inputs.tag_name }}
- name: Set up Java
uses: actions/setup-java@v4.5.0
with:
java-version: '21'
distribution: "zulu"
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Setup Java
uses: ./.github/actions/setup-java
- name: Setup git
run: |
git config --global user.name atdi
git config --global user.email aurel.avramescu@gmail.com
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: ./.github/actions/setup-git
- name: Generate Dokka Documentation
run: ./gradlew dokkaGenerateHtml

Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4.5.0
with:
java-version: '21'
distribution: "zulu"
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Setup Java
uses: ./.github/actions/setup-java
- name: Build&Test
run: ./gradlew build
9 changes: 2 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,8 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ inputs.tag_name }}
- name: Set up Java
uses: actions/setup-java@v4.5.0
with:
java-version: '21'
distribution: "zulu"
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Setup Java
uses: ./.github/actions/setup-java
- name: Release
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,9 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4.5.0
with:
java-version: '21'
distribution: "zulu"
- name: Setup Java
uses: ./.github/actions/setup-java
- name: Setup git
run: |
git config --global user.name atdi
git config --global user.email aurel.avramescu@gmail.com
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: ./.github/actions/setup-git
- name: Release
run: ./gradlew release -Prelease.useAutomaticVersion=true
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ tasks.jacocoTestReport {
}

kotlin {
jvmToolchain(21)
jvmToolchain(17)
}

configure<ReleaseExtension> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ void itShouldDecodeSuccessBase64() throws IOException {
var path = NistFileReaderJavaTest.class.getResource("/base64/base64content.txt").getPath();
String base64 = Files.readString(Paths.get(path));
var bytes = Base64.getDecoder().decode(base64);
try (ExecutorService executor = Executors.newFixedThreadPool(2)) {
CompletableFuture<Boolean> future1 = CompletableFuture.supplyAsync(() -> decodeNist(bytes), executor);
CompletableFuture<Boolean> future2 = CompletableFuture.supplyAsync(() -> decodeNist(bytes), executor);
CompletableFuture.allOf(future1, future2).join();
}
ExecutorService executor = Executors.newFixedThreadPool(2);
CompletableFuture<Boolean> future1 = CompletableFuture.supplyAsync(() -> decodeNist(bytes), executor);
CompletableFuture<Boolean> future2 = CompletableFuture.supplyAsync(() -> decodeNist(bytes), executor);
CompletableFuture.allOf(future1, future2).join();
executor.shutdown();
}

private static boolean decodeNist(byte[] bytes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,11 @@ import io.kotest.matchers.shouldBe
import io.kotest.matchers.string.shouldContain
import java.io.File
import javax.imageio.ImageIO
import kotlin.test.Ignore
import kotlin.test.Test

class NistFileReaderTest {
@Ignore
@Test
fun `it should read sample nist file and compare fingerprint images with references`() {
val url = NistFileReaderTest::class.java.getResource("/sample/nist/sample.an2")
Expand Down
Loading