ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjust ScanJar loggers

Browse source
This commit is contained in:
Jason Penilla 2023-09-15 09:59:35 -07:00
parent 28786b0947
commit d23909c7d8
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/ScanJar.kt
View file

@ -32,6 +32,8 @@ import javax.inject.Inject
import kotlin.io.path.*
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging
import org.gradle.api.provider.ListProperty
import org.gradle.api.tasks.Classpath
import org.gradle.api.tasks.Internal
@ -44,6 +46,9 @@ import org.gradle.workers.WorkerExecutor
import org.objectweb.asm.tree.ClassNode
abstract class ScanJar : JavaLauncherTask() {
companion object {
private val logger: Logger = Logging.getLogger(ScanJar::class.java)
}
@get:Classpath
abstract val jarToScan: RegularFileProperty
@ -105,7 +110,7 @@ abstract class ScanJar : JavaLauncherTask() {
try {
classPathJars += it.toPath().openZip()
} catch (ex: Exception) {
ScanJarForBadCalls.logger.error("Failed to open zip $it", ex)
logger.error("Failed to open zip $it", ex)
if (fail == null) {
fail = ex
} else {
@ -125,7 +130,7 @@ abstract class ScanJar : JavaLauncherTask() {
try {
it.close()
} catch (ex: Exception) {
ScanJarForBadCalls.logger.error("Failed to close zip $it", ex)
logger.error("Failed to close zip $it", ex)
if (err == null) {
err = ex
} else {

2
paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/ScanJarForBadCalls.kt
View file

@ -41,7 +41,7 @@ import org.objectweb.asm.tree.MethodNode
@CacheableTask
abstract class ScanJarForBadCalls : ScanJar() {
companion object {
val logger: Logger = Logging.getLogger(ScanJarForBadCalls::class.java)
private val logger: Logger = Logging.getLogger(ScanJarForBadCalls::class.java)
}
@get:Input

2
paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/ScanJarForOldGeneratedCode.kt
View file

@ -35,7 +35,7 @@ import org.objectweb.asm.tree.ClassNode
@CacheableTask
abstract class ScanJarForOldGeneratedCode : ScanJar() {
companion object {
val logger: Logger = Logging.getLogger(ScanJarForOldGeneratedCode::class.java)
private val logger: Logger = Logging.getLogger(ScanJarForOldGeneratedCode::class.java)
}
@get:Input