diff --git a/build.gradle b/build.gradle index a6c2c3c..7101a37 100644 --- a/build.gradle +++ b/build.gradle @@ -18,10 +18,13 @@ allprojects { mavenCentral() } dependencies { - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: getProperty('junitJupiter.version') - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: getProperty('junitJupiter.version') - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: getProperty('junitJupiter.version') + implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.version')) + + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine' } + lombok { version = getProperty('lombok.version') } @@ -37,7 +40,7 @@ configurations { } dependencies { - implementation group: "org.slf4j", name: "slf4j-api", version: getProperty('slf4j.version') + implementation group: "org.slf4j", name: "slf4j-api" pathClassloaderTest group: 'com.google.inject', name: 'guice', version: getProperty('guice.version') } @@ -59,13 +62,6 @@ TaskProvider pathClassLoaderTestBundleTask = tasks.register("pathClassLoade test { inputs.files(pathClassLoaderTestBundleTask) useJUnitPlatform() - Dependency junitJupiterEngineDependency = - dependencies.create( - group: 'org.junit.jupiter', - name: 'junit-jupiter-engine', - version: project.getProperty('junitJupiter.version') - ) - File junitJupiterEngineJar = configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME) .resolvedConfiguration.resolvedArtifacts.grep { ResolvedArtifact resolvedArtifact -> ModuleVersionIdentifier id = resolvedArtifact.moduleVersion.id diff --git a/gradle.properties b/gradle.properties index a34f56f..0ac8846 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ gradle.version = 7.4.2 jwo.version=1.0-SNAPSHOT -junitJupiter.version=5.8.2 +lys.version = 0.1-SNAPSHOT lombok.version=1.18.22 -slf4j.version=1.7.32 guice.version = 5.0.1 diff --git a/src/test/java/net/woggioni/jwo/ExtractorInputStreamTest.java b/src/test/java/net/woggioni/jwo/ExtractorInputStreamTest.java index 2347b60..bdc9056 100644 --- a/src/test/java/net/woggioni/jwo/ExtractorInputStreamTest.java +++ b/src/test/java/net/woggioni/jwo/ExtractorInputStreamTest.java @@ -37,7 +37,7 @@ public class ExtractorInputStreamTest { @SneakyThrows private static void referenceUnzipMethod(Path source, Path destination) { - try(FileSystem fs = FileSystems.newFileSystem(source, null)) { + try(FileSystem fs = FileSystems.newFileSystem(source, (ClassLoader) null)) { for(Path root : fs.getRootDirectories()) { Files.walk(root) .filter(it -> !Files.isDirectory(it)).forEach(new Consumer() {