removed mu.KotlinLogging support, as it doesn't have proper JPMS support!

master Version_1.39
Robinson 2023-01-15 01:04:47 +01:00
parent dbd64a89c9
commit 858927509d
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
4 changed files with 10 additions and 20 deletions

View File

@ -98,12 +98,6 @@
Tatu Saloranta (tatu.saloranta@iki.fi)
Contributors. See source release-notes/CREDITS
- kotlin-logging - Lightweight logging framework for Kotlin
[The Apache Software License, Version 2.0]
https://github.com/MicroUtils/kotlin-logging
Copyright 2023
Ohad Shai
- SLF4J - Simple facade or abstraction for various logging frameworks
[MIT License]
http://www.slf4j.org

View File

@ -26,7 +26,7 @@ gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS // always show th
plugins {
id("com.dorkbox.GradleUtils") version "3.6"
id("com.dorkbox.Licensing") version "2.17"
id("com.dorkbox.Licensing") version "2.17.1"
id("com.dorkbox.VersionUpdate") version "2.5"
id("com.dorkbox.GradlePublish") version "1.15"
@ -37,7 +37,7 @@ object Extras {
// set for the project
const val description = "Utilities for use within Java projects"
const val group = "com.dorkbox"
const val version = "1.38"
const val version = "1.39"
// set as project.ext
const val name = "Utilities"
@ -170,10 +170,10 @@ dependencies {
// https://github.com/cowtowncoder/java-uuid-generator
// Java UUID class doesn't expose time/location versions, has a flawed compareTo() on 64bit, and is slow. This one is also thread safe.
api("com.fasterxml.uuid:java-uuid-generator:4.0.1")
api("com.fasterxml.uuid:java-uuid-generator:4.1.0")
// https://github.com/MicroUtils/kotlin-logging
api("io.github.microutils:kotlin-logging:3.0.4")
// // https://github.com/MicroUtils/kotlin-logging NO JPMS SUPPORT!
// api("io.github.microutils:kotlin-logging:3.0.4")
api("org.slf4j:slf4j-api:2.0.6")
api("org.tukaani:xz:1.9")
@ -185,7 +185,7 @@ dependencies {
// compileOnly("com.esotericsoftware:kryo:5.3.0")
// compileOnly("de.javakaffee:kryo-serializers:0.45")
compileOnly("io.netty:netty-buffer:4.1.86.Final")
compileOnly("io.netty:netty-buffer:4.1.87.Final")
val bcVersion = "1.70"
compileOnly("org.bouncycastle:bcprov-jdk15on:$bcVersion")

View File

@ -25,16 +25,11 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext
import mu.KLogger
import mu.KotlinLogging
import java.io.PrintWriter
import java.io.StringWriter
import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.coroutineContext
inline fun <reified T> T.logger(name: String = T::class.java.simpleName): KLogger {
return KotlinLogging.logger(name)
}
fun Exception.stackTraceToString(): String {
val exceptionWriter = StringWriter()

View File

@ -16,7 +16,8 @@
package dorkbox.util
import dorkbox.os.OS
import mu.KotlinLogging
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import java.io.BufferedInputStream
import java.io.BufferedReader
import java.io.BufferedWriter
@ -56,9 +57,9 @@ object FileUtil {
/**
* Gets the version number.
*/
val version = "1.38"
val version = "1.39"
private val log = KotlinLogging.logger(FileUtil::class.java.name)
private val log: Logger = LoggerFactory.getLogger(FileUtil::class.java)
private const val DEBUG = false