azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace message collector with reporting lambda

Browse Source 
to simplify usages and slightly reduce dependencies
This commit is contained in:
Ilya Chernikov
2019-04-24 12:41:10 +02:00
parent 61c1312f1a
commit a4c049d26e
6 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt
+2 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.useLazyTaskConfiguration
import org.jetbrains.kotlin.gradle.utils.isGradleVersionAtLeast
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsFromClasspathDiscoverySource
import org.jetbrains.kotlin.scripting.definitions.reporter
import java.io.File
private const val MIN_SUPPORTED_GRADLE_MAJOR_VERSION = 5
@@ -166,7 +167,7 @@ internal class DiscoverScriptExtensionsTransform : ArtifactTransform() {
val definitions =
ScriptDefinitionsFromClasspathDiscoverySource(
listOf(input), emptyMap(),
PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, false)
PrintingMessageCollector(System.out, MessageRenderer.WITHOUT_PATHS, false).reporter
).definitions
val extensions = definitions.mapTo(arrayListOf()) { it.fileExtension }
return if (extensions.isNotEmpty()) {