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
28 changes: 19 additions & 9 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,52 @@ on:
pull_request:
branches: [ main ]

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '17', '21', '23' ]
java: [ '17', '21', '25' ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Setup Java
uses: actions/setup-java@v1
uses: actions/setup-java@d1374f8ac74474200d16ef8ecee22c7ae7a51880 # v6.3.0
with:
distribution: temurin
java-version: ${{ matrix.java }}
- name: Setup Gradle
uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
- name: Build with Gradle
run: ./gradlew build

validateGradleWrapper:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1.0.4
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: gradle/actions/wrapper-validation@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1

publishCoverage:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- name: Setup Java
uses: actions/setup-java@v1
uses: actions/setup-java@d1374f8ac74474200d16ef8ecee22c7ae7a51880 # v6.3.0
with:
java-version: 11
distribution: temurin
java-version: '25'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@8da46b539cd8fe6ab27ca75128919a18d757604c # v6.4.1
- name: Build with Gradle
run: ./gradlew jacocoTestReport
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
with:
files: ./build/reports/jacoco/test/jacocoTestReport.xml
name: codecov
token: ${{ secrets.CODECOV_TOKEN }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![CI](https://github.com/bwaldvogel/liblinear-java/workflows/CI/badge.svg)](https://github.com/bwaldvogel/liblinear-java/actions)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/de.bwaldvogel/liblinear/badge.svg)](http://maven-badges.herokuapp.com/maven-central/de.bwaldvogel/liblinear)
[![Maven Central](https://img.shields.io/maven-central/v/de.bwaldvogel/liblinear)](https://central.sonatype.com/artifact/de.bwaldvogel/liblinear)
[![codecov](https://codecov.io/gh/bwaldvogel/liblinear-java/branch/main/graph/badge.svg?token=Scy4yJzBf7)](https://codecov.io/gh/bwaldvogel/liblinear-java)
[![BSD 3-Clause License](https://img.shields.io/github/license/bwaldvogel/liblinear-java.svg)](https://opensource.org/licenses/BSD-3-Clause)
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/BenediktWaldvogel)
Expand All @@ -17,7 +17,7 @@ The upstream GitHub project can be found at

## Dependencies ##

The only requirement is Java 11 or later.
The only requirement is Java 17 or later.

## Usage ##

Expand Down
50 changes: 27 additions & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,38 @@ plugins {
id 'signing'
id 'jacoco'
id 'de.undercouch.download' version 'latest.release'
id 'me.champeau.gradle.jmh' version 'latest.release'
id 'me.champeau.jmh' version 'latest.release'
}

group = "de.bwaldvogel"
version = '2.44'

java {
sourceCompatibility = '11'
targetCompatibility = '11'
sourceCompatibility = '17'
targetCompatibility = '17'
}

tasks.withType(JavaCompile) {
tasks.withType(JavaCompile).configureEach {
options.release = 17
options.encoding = 'UTF-8'
options.compilerArgs.addAll(['-Xlint:all', '-Werror'])
}

jar {
manifest {
attributes 'Implementation-Title': project.name, 'Implementation-Version': archiveVersion
attributes 'Implementation-Title': project.name, 'Implementation-Version': archiveVersion.get()
}
}

task sourceJar(type: Jar) {
tasks.register('sourceJar', Jar) {
archiveClassifier = "sources"
from sourceSets.main.allJava
}

task javadocJar(type: Jar, dependsOn: javadoc) {
tasks.register('javadocJar', Jar) {
dependsOn tasks.named('javadoc')
archiveClassifier = "javadoc"
from javadoc.destinationDir
from tasks.named('javadoc').map { it.destinationDir }
}

publishing {
Expand Down Expand Up @@ -80,8 +82,8 @@ publishing {

from components.java

artifact sourceJar
artifact javadocJar
artifact tasks.named('sourceJar')
artifact tasks.named('javadocJar')

versionMapping {
usage('java-api') {
Expand Down Expand Up @@ -133,12 +135,12 @@ test {
}

wrapper {
gradleVersion = "8.12"
gradleVersion = "9.9.1"
distributionType = Wrapper.DistributionType.ALL
}

jmh {
include = ['de\\.bwaldvogel\\.liblinear\\.LinearBenchmark.*']
includes = ['de\\.bwaldvogel\\.liblinear\\.LinearBenchmark.*']
jvmArgs = ["-Ddataset.directory=" + projectDir + "/src/test/datasets"]
}

Expand All @@ -147,17 +149,19 @@ tasks.named('jmh').configure {
}

dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: 'latest.release'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: 'latest.release'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: 'latest.release'
testImplementation group: 'org.slf4j', name: 'slf4j-api', version: 'latest.release'
testImplementation group: 'org.assertj', name: 'assertj-core', version: 'latest.release'
testImplementation group: 'org.mockito', name: 'mockito-core', version: 'latest.release'
testImplementation group: 'nl.jqno.equalsverifier', name: 'equalsverifier', version: 'latest.release'

testRuntimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: 'latest.release'

jmh group: 'org.apache.commons', name: 'commons-compress', version: 'latest.release'
testImplementation platform('org.junit:junit-bom:latest.release')
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation 'org.slf4j:slf4j-api:latest.release'
testImplementation 'org.assertj:assertj-core:latest.release'
testImplementation 'org.mockito:mockito-core:latest.release'
testImplementation 'nl.jqno.equalsverifier:equalsverifier:latest.release'

testRuntimeOnly 'ch.qos.logback:logback-classic:latest.release'

jmh 'org.apache.commons:commons-compress:latest.release'
jmh 'org.openjdk.jmh:jmh-generator-annprocess:latest.release' // for IntelliJ

components.all { ComponentMetadataDetails details ->
Expand Down
14 changes: 7 additions & 7 deletions buildscript-gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
de.undercouch.download:de.undercouch.download.gradle.plugin:5.6.0=classpath
de.undercouch:gradle-download-task:5.6.0=classpath
me.champeau.gradle.jmh:me.champeau.gradle.jmh.gradle.plugin:0.5.3=classpath
me.champeau.gradle:jmh-gradle-plugin:0.5.3=classpath
net.sf.jopt-simple:jopt-simple:4.6=classpath
org.apache.commons:commons-math3:3.2=classpath
org.openjdk.jmh:jmh-core:1.27=classpath
de.undercouch.download:de.undercouch.download.gradle.plugin:5.7.0=classpath
de.undercouch:gradle-download-task:5.7.0=classpath
me.champeau.jmh:jmh-gradle-plugin:0.7.4=classpath
me.champeau.jmh:me.champeau.jmh.gradle.plugin:0.7.4=classpath
net.sf.jopt-simple:jopt-simple:5.0.4=classpath
org.apache.commons:commons-math3:3.6.1=classpath
org.openjdk.jmh:jmh-core:1.37=classpath
empty=
28 changes: 17 additions & 11 deletions datasets.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
task downloadDatasetSplice(type: Download) {
tasks.register('downloadDatasetSplice', Download) {
def baseUrl = 'https://www.csie.ntu.edu.tw/~cjlin/libsvmtools/datasets/binary'
src([
"${baseUrl}/splice",
Expand All @@ -8,19 +8,21 @@ task downloadDatasetSplice(type: Download) {
overwrite false
}

task verifyDatasetSpliceTrain(type: Verify, dependsOn: downloadDatasetSplice) {
tasks.register('verifyDatasetSpliceTrain', Verify) {
dependsOn 'downloadDatasetSplice'
src 'src/test/datasets/splice/splice'
algorithm 'SHA-256'
checksum 'eee33566cfe8988ec26122460cc712d66c5c5b79b966b259408e803addaa584d'
}

task verifyDatasetSpliceTest(type: Verify, dependsOn: downloadDatasetSplice) {
tasks.register('verifyDatasetSpliceTest', Verify) {
dependsOn 'downloadDatasetSplice'
src 'src/test/datasets/splice/splice.t'
algorithm 'SHA-256'
checksum 'f40da7cfd17860f3f1a1bb7d118f8e86c306d232ca6ac6ddefbaaef266abaa03'
}

task downloadDatasetDna(type: Download) {
tasks.register('downloadDatasetDna', Download) {
def baseUrl = 'https://www.csie.ntu.edu.tw/~cjlin/libsvmtools/datasets/multiclass'
src([
"${baseUrl}/dna.scale",
Expand All @@ -30,19 +32,21 @@ task downloadDatasetDna(type: Download) {
overwrite false
}

task verifyDatasetDnaTrain(type: Verify, dependsOn: downloadDatasetDna) {
tasks.register('verifyDatasetDnaTrain', Verify) {
dependsOn 'downloadDatasetDna'
src 'src/test/datasets/dna.scale/dna.scale'
algorithm 'SHA-256'
checksum '03d39477c5e48415e9cd18e006efc8f7a3b5c3deaee8289a72511c35070e3cfe'
}

task verifyDatasetDnaTest(type: Verify, dependsOn: downloadDatasetDna) {
tasks.register('verifyDatasetDnaTest', Verify) {
dependsOn 'downloadDatasetDna'
src 'src/test/datasets/dna.scale/dna.scale.t'
algorithm 'SHA-256'
checksum 'd2eeed170e4e38ae2aba6aa4cd27a8ca4ecceb01a7751e8e509bb4e1a6bcef39'
}

task downloadDatasetRcv1(type: Download) {
tasks.register('downloadDatasetRcv1', Download) {
def baseUrl = 'https://www.csie.ntu.edu.tw/~cjlin/libsvmtools/datasets/binary'
src([
"${baseUrl}/rcv1_train.binary.bz2",
Expand All @@ -52,24 +56,26 @@ task downloadDatasetRcv1(type: Download) {
overwrite false
}

task verifyDatasetRcv1Train(type: Verify, dependsOn: downloadDatasetRcv1) {
tasks.register('verifyDatasetRcv1Train', Verify) {
dependsOn 'downloadDatasetRcv1'
src 'src/test/datasets/rcv1/rcv1_train.binary.bz2'
algorithm 'SHA-256'
checksum 'dda0c6381811484e284e70dd0641335917debce50948346416fde7fb32fad2e2'
}

task verifyDatasetRcv1Test(type: Verify, dependsOn: downloadDatasetRcv1) {
tasks.register('verifyDatasetRcv1Test', Verify) {
dependsOn 'downloadDatasetRcv1'
src 'src/test/datasets/rcv1/rcv1_test.binary.bz2'
algorithm 'SHA-256'
checksum '975ab6c4fd8ea2a88b82e7ba2659ef21bf980ac61b3d8f13d6991739ec0f7aa7'
}

task downloadAndVerifyRcv1 {
tasks.register('downloadAndVerifyRcv1') {
dependsOn 'verifyDatasetRcv1Train'
dependsOn 'verifyDatasetRcv1Test'
}

task downloadAndVerifyDatasets {
tasks.register('downloadAndVerifyDatasets') {
dependsOn 'verifyDatasetSpliceTrain'
dependsOn 'verifyDatasetSpliceTest'
dependsOn 'verifyDatasetDnaTrain'
Expand Down
63 changes: 33 additions & 30 deletions gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,40 +1,43 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
ch.qos.logback:logback-classic:1.5.15=jmhRuntimeClasspath,testRuntimeClasspath
ch.qos.logback:logback-core:1.5.15=jmhRuntimeClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.17.1=jmh,jmhCompileClasspath,jmhRuntimeClasspath
commons-io:commons-io:2.16.1=jmh,jmhCompileClasspath,jmhRuntimeClasspath
net.bytebuddy:byte-buddy-agent:1.15.4=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
net.bytebuddy:byte-buddy:1.15.11=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
# To regenerate this file, run: ./gradlew :dependencies --write-locks
ch.qos.logback:logback-classic:1.6.6=jmhRuntimeClasspath,testRuntimeClasspath
ch.qos.logback:logback-core:1.6.6=jmhRuntimeClasspath,testRuntimeClasspath
commons-codec:commons-codec:1.19.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
commons-io:commons-io:2.20.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
net.bytebuddy:byte-buddy-agent:1.17.7=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
net.bytebuddy:byte-buddy:1.18.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath
nl.jqno.equalsverifier:equalsverifier:3.18=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-compress:1.27.1=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.apache.commons:commons-lang3:3.16.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
nl.jqno.equalsverifier:equalsverifier:4.5.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-compress:1.28.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.apache.commons:commons-lang3:3.18.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
org.assertj:assertj-core:3.27.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jacoco:org.jacoco.agent:0.8.12=jacocoAgent,jacocoAnt
org.jacoco:org.jacoco.ant:0.8.12=jacocoAnt
org.jacoco:org.jacoco.core:0.8.12=jacocoAnt
org.jacoco:org.jacoco.report:0.8.12=jacocoAnt
org.junit.jupiter:junit-jupiter-api:5.11.4=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:5.11.4=jmhRuntimeClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:5.11.4=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.11.4=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.11.4=jmhRuntimeClasspath,testRuntimeClasspath
org.junit:junit-bom:5.11.4=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:5.14.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.4=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.assertj:assertj-core:3.27.7=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jacoco:org.jacoco.agent:0.8.15=jacocoAgent,jacocoAnt
org.jacoco:org.jacoco.ant:0.8.15=jacocoAnt
org.jacoco:org.jacoco.core:0.8.15=jacocoAnt
org.jacoco:org.jacoco.report:0.8.15=jacocoAnt
org.jspecify:jspecify:1.0.0=testCompileClasspath
org.junit.jupiter:junit-jupiter-api:6.1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-engine:6.1.3=jmhRuntimeClasspath,testRuntimeClasspath
org.junit.jupiter:junit-jupiter-params:6.1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:6.1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:6.1.3=jmhRuntimeClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-launcher:6.1.3=jmhRuntimeClasspath,testRuntimeClasspath
org.junit:junit-bom:6.1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-core:5.24.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.openjdk.jmh:jmh-generator-annprocess:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.openjdk.jmh:jmh-generator-asm:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.openjdk.jmh:jmh-generator-bytecode:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.openjdk.jmh:jmh-generator-reflection:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.openjdk.jmh:jmh-generator-asm:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.openjdk.jmh:jmh-generator-bytecode:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.openjdk.jmh:jmh-generator-reflection:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-commons:9.7=jacocoAnt
org.ow2.asm:asm-tree:9.7=jacocoAnt
org.ow2.asm:asm:5.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.ow2.asm:asm:9.7=jacocoAnt
org.slf4j:slf4j-api:2.0.16=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-commons:9.11.1=jacocoAnt
org.ow2.asm:asm-tree:9.11.1=jacocoAnt
org.ow2.asm:asm:9.0=jmh,jmhCompileClasspath,jmhRuntimeClasspath
org.ow2.asm:asm:9.11.1=jacocoAnt
org.slf4j:slf4j-api:2.0.20=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=annotationProcessor,compileClasspath,jmhAnnotationProcessor,runtimeClasspath,signatures,testAnnotationProcessor
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 4 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
distributionSha256Sum=f20c816177c0ff192881874852260771b462903aef3e794b0dac4759d1fda284
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.1-all.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading