fixed gradle logging

Jolanrensen · Nov 27, 2024 · d7738b3 · d7738b3
1 parent faf305f
commit d7738b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/doc-processor-gradle-plugin/src/main/kotlin/nl/jolanrensen/docProcessor/ProcessDocsAction.kt b/doc-processor-gradle-plugin/src/main/kotlin/nl/jolanrensen/docProcessor/ProcessDocsAction.kt
@@ -1,7 +1,7 @@
 package nl.jolanrensen.docProcessor
 
 import com.intellij.openapi.util.TextRange
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.jolanrensen.docProcessor.gradle.ProcessDocsGradleAction
 import nl.jolanrensen.docProcessor.gradle.lifecycle
 import org.jetbrains.dokka.CoreExtensions

diff --git a/...ocessor-gradle-plugin/src/main/kotlin/nl/jolanrensen/docProcessor/gradle/GradleLogging.kt b/...ocessor-gradle-plugin/src/main/kotlin/nl/jolanrensen/docProcessor/gradle/GradleLogging.kt
@@ -1,9 +1,11 @@
 package nl.jolanrensen.docProcessor.gradle
 
-import mu.KLogger
+import io.github.oshai.kotlinlogging.DelegatingKLogger
+import io.github.oshai.kotlinlogging.KLogger
 import org.gradle.api.logging.Logger
 
 fun KLogger.lifecycle(msg: () -> Any?) {
+    this as DelegatingKLogger<*>
     require(underlyingLogger is Logger) { "Logger must be org.gradle.api.logging.Logger for this." }
     val underlyingLogger = underlyingLogger as Logger
 
@@ -13,6 +15,7 @@ fun KLogger.lifecycle(msg: () -> Any?) {
 }
 
 fun KLogger.lifecycle(throwable: Throwable, msg: () -> Any?) {
+    this as DelegatingKLogger<*>
     require(underlyingLogger is Logger) { "Logger must be org.gradle.api.logging.Logger for this." }
     val underlyingLogger = underlyingLogger as Logger
 
@@ -27,6 +30,7 @@ fun KLogger.lifecycle(throwable: Throwable, msg: () -> Any?) {
  * @param message the log message.
  */
 fun KLogger.lifecycle(message: String?) {
+    this as DelegatingKLogger<*>
     require(underlyingLogger is Logger) { "Logger must be org.gradle.api.logging.Logger for this." }
     (underlyingLogger as Logger).lifecycle(message)
 }
@@ -38,6 +42,7 @@ fun KLogger.lifecycle(message: String?) {
  * @param objects the log message parameters.
  */
 fun KLogger.lifecycle(message: String?, vararg objects: Any?) {
+    this as DelegatingKLogger<*>
     require(underlyingLogger is Logger) { "Logger must be org.gradle.api.logging.Logger for this." }
     (underlyingLogger as Logger).lifecycle(message, *objects)
 }
@@ -49,6 +54,7 @@ fun KLogger.lifecycle(message: String?, vararg objects: Any?) {
  * @param throwable the exception to log.
  */
 fun KLogger.lifecycle(message: String?, throwable: Throwable?) {
+    this as DelegatingKLogger<*>
     require(underlyingLogger is Logger) { "Logger must be org.gradle.api.logging.Logger for this." }
     (underlyingLogger as Logger).lifecycle(message, throwable)
 }
diff --git a/...cessor-gradle-plugin/src/main/kotlin/nl/jolanrensen/docProcessor/gradle/ProcessDocTask.kt b/...cessor-gradle-plugin/src/main/kotlin/nl/jolanrensen/docProcessor/gradle/ProcessDocTask.kt
@@ -1,6 +1,6 @@
 package nl.jolanrensen.docProcessor.gradle
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.jolanrensen.docProcessor.defaultProcessors.ARG_DOC_PROCESSOR
 import nl.jolanrensen.docProcessor.defaultProcessors.COMMENT_DOC_PROCESSOR
 import nl.jolanrensen.docProcessor.defaultProcessors.EXPORT_AS_HTML_DOC_PROCESSOR