update to gradle 7.4.2

This commit is contained in:
Jörg Prante 2022-05-25 15:25:04 +02:00
parent 337e1c19c0
commit 120042132b
8 changed files with 24 additions and 26 deletions

View file

@ -2,4 +2,5 @@ group = org.xbib
name = archive name = archive
version = 1.1.0 version = 1.1.0
gradle.wrapper.version = 7.3.2 org.gradle.warning.mode = all
gradle.wrapper.version = 7.4.2

View file

@ -21,19 +21,6 @@ jar {
} }
} }
task sourcesJar(type: Jar, dependsOn: classes) {
classifier 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier 'javadoc'
}
artifacts {
archives sourcesJar, javadocJar
}
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:all,-fallthrough' options.compilerArgs << '-Xlint:all,-fallthrough'
} }

View file

@ -5,8 +5,6 @@ publishing {
publications { publications {
mavenJava(MavenPublication) { mavenJava(MavenPublication) {
from components.java from components.java
artifact sourcesJar
artifact javadocJar
pom { pom {
name = project.name name = project.name
description = rootProject.ext.description description = rootProject.ext.description

View file

@ -1,12 +1,9 @@
def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2'
def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
dependencies { dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}" testImplementation libs.junit.jupiter.api
testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}" testImplementation libs.junit.jupiter.params
testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}" testImplementation libs.hamcrest
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}" testRuntimeOnly libs.junit.jupiter.engine
} }
test { test {

Binary file not shown.

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -9,7 +9,7 @@ public class ZipTest {
@Test @Test
public void testZip() throws Exception { public void testZip() throws Exception {
InputStream in = getClass().getResourceAsStream("test.zip"); InputStream in = getClass().getResourceAsStream("test.zip");
ZipArchiveInputStream z = new ZipArchiveInputStream(in); ZipArchiveInputStream<ZipArchiveEntry> z = new ZipArchiveInputStream<>(in);
byte[] buffer = new byte[1024]; byte[] buffer = new byte[1024];
long total = 0L; long total = 0L;
while ((z.getNextEntry()) != null) { while ((z.getNextEntry()) != null) {

View file

@ -1,3 +1,18 @@
dependencyResolutionManagement {
versionCatalogs {
libs {
version('gradle', '7.4.2')
version('junit', '5.8.2')
library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
library('junit4', 'junit:junit:4.13.2')
library('hamcrest', 'org.hamcrest:hamcrest-library:2.2')
plugin('publish', 'com.gradle.plugin-publish').version('0.18.0')
}
}
}
include 'io-compress-bgzf' include 'io-compress-bgzf'
include 'io-compress-bzip2' include 'io-compress-bzip2'
include 'io-compress-lzf' include 'io-compress-lzf'
@ -10,4 +25,4 @@ include 'io-archive-dump'
include 'io-archive-jar' include 'io-archive-jar'
include 'io-archive-tar' include 'io-archive-tar'
include 'io-archive-zip' include 'io-archive-zip'
include 'io-codec' include 'io-codec'