Minor: remove duplicated logger utils

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationFileUpdater.kt

@@ -1,7 +1,7 @@
 package org.jetbrains.kotlin.annotation
 
 import org.gradle.api.logging.Logging
-import org.jetbrains.kotlin.gradle.tasks.kotlinDebug
+import org.jetbrains.kotlin.gradle.plugin.kotlinDebug
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import java.io.File
 import java.util.*

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/gradleUtils.kt

@@ -44,6 +44,10 @@ internal inline fun <reified T : Any> Any.addExtension(name: String, extension:
 internal fun Any.getConvention(name: String): Any? =
         (this as HasConvention).convention.plugins[name]
 
+internal fun Logger.kotlinInfo(message: String) {
+    this.info("[KOTLIN] $message")
+}
+
 internal fun Logger.kotlinDebug(message: String) {
     this.debug("[KOTLIN] $message")
 }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt

@@ -29,6 +29,8 @@ import org.jetbrains.kotlin.compilerRunner.OutputItemsCollector
 import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.gradle.dsl.*
+import org.jetbrains.kotlin.gradle.plugin.kotlinDebug
+import org.jetbrains.kotlin.gradle.plugin.kotlinInfo
 import org.jetbrains.kotlin.incremental.*
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.components.SourceRetentionAnnotationHandler
@@ -417,18 +419,4 @@ internal class GradleMessageCollector(val logger: Logger) : MessageCollector {
             else -> throw IllegalArgumentException("Unknown CompilerMessageSeverity: $severity")
         }
     }
-}
+}
-
-internal fun Logger.kotlinInfo(message: String) {
-    this.info("[KOTLIN] $message")
-}
-
-internal fun Logger.kotlinDebug(message: String) {
-    this.debug("[KOTLIN] $message")
-}
-
-internal inline fun Logger.kotlinDebug(message: ()->String) {
-    if (isDebugEnabled) {
-        kotlinDebug(message())
-    }
-}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/ChangedJavaFilesProcessor.kt

@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.com.intellij.psi.PsiFileFactory
 import org.jetbrains.kotlin.com.intellij.psi.PsiJavaFile
 import org.jetbrains.kotlin.config.CompilerConfiguration
-import org.jetbrains.kotlin.gradle.tasks.kotlinDebug
+import org.jetbrains.kotlin.gradle.plugin.kotlinDebug
 import org.jetbrains.kotlin.incremental.ChangesEither
 import org.jetbrains.kotlin.incremental.LookupSymbol
 import org.jetbrains.kotlin.incremental.snapshots.FileCollectionDiff

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/GradleIncReporter.kt

@@ -1,7 +1,7 @@
 package org.jetbrains.kotlin.incremental
 
 import org.gradle.api.logging.Logging
-import org.jetbrains.kotlin.gradle.tasks.kotlinDebug
+import org.jetbrains.kotlin.gradle.plugin.kotlinDebug
 import java.io.File
 
 internal class GradleIncReporter(private val projectRootFile: File) : IncReporter() {