8000 upgrade kotlin-logging · jasync-sql/jasync-sql@cde3f33 · GitHub
[go: up one dir, main page]
Skip to content

Commit cde3f33

Browse files
oshaioshai
committed
upgrade kotlin-logging
and slf4j, logback
1 parent 63bd36a commit cde3f33

File tree

48 files changed

+50
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+50
-50
lines changed

‎db-async-common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
implementation("io.netty:netty-handler:$NETTY_VERSION")
2020
compileOnly("io.netty:netty-transport-native-epoll:$NETTY_VERSION:linux-x86_64")
2121
compileOnly("io.netty:netty-transport-native-kqueue:$NETTY_VERSION:osx-x86_64")
22-
implementation("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
22+
implementation("io.github.oshai:kotlin-logging-jvm:$KOTLIN_LOGGING_VERSION")
2323
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$KOTLIN_COROUTINES_VERSION")
2424
testImplementation("junit:junit:$JUNIT_VERSION")
2525
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION")

‎db-async-common/src/main/java/com/github/jasync/sql/db/Configuration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package com.github.jasync.sql.db
33
import com.github.jasync.sql.db.interceptor.QueryInterceptor
44
import com.github.jasync.sql.db.util.ExecutorServiceUtils
55
import com.github.jasync.sql.db.util.NettyUtils
6+
import io.github.oshai.kotlinlogging.KotlinLogging
67
import io.netty.buffer.ByteBufAllocator
78
import io.netty.buffer.PooledByteBufAllocator
89
import io.netty.channel.EventLoopGroup
910
import io.netty.channel.nio.NioEventLoopGroup
1011
import io.netty.util.CharsetUtil
11-
import mu.KotlinLogging
1212
import java.nio.charset.Charset
1313
import java.nio.file.Path
1414
import java.time.Duration

‎db-async-common/src/main/java/com/github/jasync/sql/db/interceptor/Interceptors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.github.jasync.sql.db.interceptor
22

33
import com.github.jasync.sql.db.QueryResult
44
import com.github.jasync.sql.db.util.mapTry
5-
import mu.KotlinLogging
5+
import io.github.oshai.kotlinlogging.KotlinLogging
66
import org.slf4j.MDC
77
import java.util.concurrent.CompletableFuture
88
import java.util.function.Supplier

‎db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.github.jasync.sql.db.interceptor.PreparedStatementParams
88
import com.github.jasync.sql.db.util.FP
99
import com.github.jasync.sql.db.util.Try
1010
import com.github.jasync.sql.db.util.map
11-
import mu.KotlinLogging
11+
import io.github.oshai.kotlinlogging.KotlinLogging
1212
import java.util.concurrent.CompletableFuture
1313

1414
private val logger = KotlinLogging.logger {}

‎db-async-common/src/main/java/com/github/jasync/sql/db/pool/ConnectionPool.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.github.jasync.sql.db.interceptor.wrapPreparedStatementWithInterceptor
99
import com.github.jasync.sql.db.interceptor.wrapQueryWithInterceptors
1010
import com.github.jasync.sql.db.util.FP
1111
import com.github.jasync.sql.db.util.mapAsync
12-
import mu.KotlinLogging
12+
import io.github.oshai.kotlinlogging.KotlinLogging
1313
import java.util.concurrent.CompletableFuture
1414

1515
private val logger = KotlinLogging.logger {}

‎db-async-common/src/main/java/com/github/jasync/sql/db/pool/TimeoutScheduler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.github.jasync.sql.db.pool
33
import com.github.jasync.sql.db.util.nullableMap
44
import com.github.jasync.sql.db.util.onCompleteAsync
55
import com.github.jasync.sql.db.util.tryFailure
6+
import io.github.oshai.kotlinlogging.KotlinLogging
67
import io.netty.channel.EventLoopGroup
7-
import mu.KotlinLogging
88
import java.time.Duration
99
import java.util.concurrent.CompletableFuture
1010
import java.util.concurrent.Executor

‎db-async-common/src/main/java/com/github/jasync/sql/db/util/AbstractURIParser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.github.jasync.sql.db.util
33
import com.github.jasync.sql.db.Configuration
44
import com.github.jasync.sql.db.SSLConfiguration
55
import com.github.jasync.sql.db.exceptions.UnableToParseURLException
6-
import mu.KotlinLogging
6+
import io.github.oshai.kotlinlogging.KotlinLogging
77
import java.net.URI
88
import java.net.URISyntaxException
99
import java.net.URLDecoder

‎db-async-common/src/main/java/com/github/jasync/sql/db/util/NettyUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.github.jasync.sql.db.util
22

33
import com.github.jasync.sql.db.Configuration
44
import com.github.jasync.sql.db.SSLConfiguration
5+
import io.github.oshai.kotlinlogging.KotlinLogging
56
import io.netty.channel.Channel
67
import io.netty.channel.EventLoopGroup
78
import io.netty.channel.epoll.Epoll
@@ -20,7 +21,6 @@ import io.netty.handler.ssl.SslContextBuilder
2021
import io.netty.handler.ssl.util.InsecureTrustManagerFactory
2122
import io.netty.util.internal.logging.InternalLoggerFactory
2223
import io.netty.util.internal.logging.Slf4JLoggerFactory
23-
import mu.KotlinLogging
2424
import java.io.FileInputStream
2525
import java.net.InetSocketAddress
2626
import java.net.SocketAddress

‎db-async-common/src/main/java/com/github/jasync/sql/db/util/PrintUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
package com.github.jasync.sql.db.util
44

5+
import io.github.oshai.kotlinlogging.KotlinLogging
56
import io.netty.buffer.ByteBuf
6-
import mu.KotlinLogging
77

88
object PrintUtils {
99

‎gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ KOTLIN_VERSION=1.8.21
22
KTLINT_VERSION=11.3.1
33
JACOCO_VERSION=0.8.8
44
KOTLIN_COROUTINES_VERSION=1.7.1
5-
SL4J_VERSION=1.7.25
5+
SL4J_VERSION=2.0.7
66
JODA_VERSION=2.12.5
77
JODA_CONVERT_VERSION=2.2.3
88
NETTY_VERSION=4.1.93.Final
9-
KOTLIN_LOGGING_VERSION=2.1.21
9+
KOTLIN_LOGGING_VERSION=4.0.0-beta-29
1010
SCRAM_CLIENT_VERSION=2.1
1111
R2DBC_SPI_VERSION=1.0.0.RELEASE
1212
REACTOR_CORE_VERSION=3.5.7
1313
REACTOR_KOTLIN_EXTENSION=1.2.2
1414
JUNIT_VERSION=4.13.2
1515
ASSERTJ_VERSION=3.23.1
1616
MOCKK_VERSION=1.9
17-
LOGBACK_VERSION=1.1.8
17+
LOGBACK_VERSION=1.3.8
1818
TEST_CONTAINERS_VERSION=1.17.6
1919
MYSQL_CONNECTOR_VERSION=5.1.47
2020
AWAITILITY_VERSION=3.1.5

0 commit comments

Comments
 (0)
0