Refactoring: move util functions to gradleUtils.kt

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

@@ -3,7 +3,6 @@ package org.jetbrains.kotlin.gradle.plugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.internal.file.FileResolver
-import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.jetbrains.kotlin.gradle.internal.KotlinSourceSetProviderImpl
 import org.jetbrains.kotlin.gradle.tasks.AndroidTasksProvider
@@ -48,12 +47,3 @@ open class Kotlin2JsPluginWrapper @Inject constructor(fileResolver: FileResolver
             Kotlin2JsPlugin(KotlinTasksProvider(), KotlinSourceSetProviderImpl(fileResolver))
 }
 
-fun Logger.kotlinDebug(message: String) {
-    this.debug("[KOTLIN] $message")
-}
-
-inline fun Logger.kotlinDebug(message: () -> String) {
-    if (isDebugEnabled) {
-        kotlinDebug(message())
-    }
-}

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

@@ -2,6 +2,7 @@ package org.jetbrains.kotlin.gradle.plugin
 
 import org.gradle.api.Task
 import org.gradle.api.file.FileCollection
+import org.gradle.api.logging.Logger
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.tasks.compile.AbstractCompile
 import java.io.File
@@ -36,4 +37,15 @@ internal inline fun <reified T : Any> Any.addExtension(name: String, extension:
         (this as ExtensionAware).extensions.add(name, extension)
 
 internal fun Any.findExtension(name: String): Any? =
-        (this as ExtensionAware).extensions.findByName(name)
+        (this as ExtensionAware).extensions.findByName(name)
+
+
+internal fun Logger.kotlinDebug(message: String) {
+    this.debug("[KOTLIN] $message")
+}
+
+internal inline fun Logger.kotlinDebug(message: () -> String) {
+    if (isDebugEnabled) {
+        kotlinDebug(message())
+    }
+}