woggioni/jwo
1
0
Fork 0
Code Actions Packages Activity

switch to lys-dependencies

Browse Source
This commit is contained in:
Walter Oggioni
2022-06-24 07:36:22 +08:00
parent 9153ba2f2c
commit ed9be33c08
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@@ -18,10 +18,13 @@ allprojects {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: getProperty('junitJupiter.version') implementation platform(group: 'com.lys', name: 'lys-dependencies', version: getProperty('lys.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') 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 { lombok {
version = getProperty('lombok.version') version = getProperty('lombok.version')
} }
@@ -37,7 +40,7 @@ configurations {
} }
dependencies { 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') pathClassloaderTest group: 'com.google.inject', name: 'guice', version: getProperty('guice.version')
} }
@@ -59,13 +62,6 @@ TaskProvider<Zip> pathClassLoaderTestBundleTask = tasks.register("pathClassLoade
test { test {
inputs.files(pathClassLoaderTestBundleTask) inputs.files(pathClassLoaderTestBundleTask)
useJUnitPlatform() 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) File junitJupiterEngineJar = configurations.getByName(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME)
.resolvedConfiguration.resolvedArtifacts.grep { ResolvedArtifact resolvedArtifact -> .resolvedConfiguration.resolvedArtifacts.grep { ResolvedArtifact resolvedArtifact ->
ModuleVersionIdentifier id = resolvedArtifact.moduleVersion.id ModuleVersionIdentifier id = resolvedArtifact.moduleVersion.id

3
gradle.properties
View File

@@ -1,6 +1,5 @@
gradle.version = 7.4.2 gradle.version = 7.4.2
jwo.version=1.0-SNAPSHOT jwo.version=1.0-SNAPSHOT
junitJupiter.version=5.8.2 lys.version = 0.1-SNAPSHOT
lombok.version=1.18.22 lombok.version=1.18.22
slf4j.version=1.7.32
guice.version = 5.0.1 guice.version = 5.0.1

2
src/test/java/net/woggioni/jwo/ExtractorInputStreamTest.java
View File

@@ -37,7 +37,7 @@ public class ExtractorInputStreamTest {
@SneakyThrows @SneakyThrows
private static void referenceUnzipMethod(Path source, Path destination) { 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()) { for(Path root : fs.getRootDirectories()) {
Files.walk(root) Files.walk(root)
.filter(it -> !Files.isDirectory(it)).forEach(new Consumer<Path>() { .filter(it -> !Files.isDirectory(it)).forEach(new Consumer<Path>() {