From 3f91df4c84ddca491d24a9f59f874df43c16a062 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 28 Nov 2016 23:36:02 +0300 Subject: [PATCH] Minor: move GradleCompilerEnvironment to separate file --- .../compilerRunner/GradleCompilerEnvironment.kt | 15 +++++++++++++++ .../compilerRunner/GradleKotlinCompilerRunner.kt | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt new file mode 100644 index 00000000000..1e9a062071c --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleCompilerEnvironment.kt @@ -0,0 +1,15 @@ +package org.jetbrains.kotlin.compilerRunner + +import org.jetbrains.kotlin.config.Services +import java.io.File +import java.net.URL + +internal class GradleCompilerEnvironment( + val compilerJar: File +) : CompilerEnvironment(Services.EMPTY) { + val compilerClasspath: List + get() = listOf(compilerJar).filterNotNull() + + val compilerClasspathURLs: List + get() = compilerClasspath.map { it.toURI().toURL() } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index fa15adfbfc7..81dd0579ff8 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -32,7 +32,6 @@ import org.jetbrains.kotlin.incremental.makeModuleFile import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream -import java.net.URL import kotlin.concurrent.thread internal const val KOTLIN_COMPILER_EXECUTION_STRATEGY_PROPERTY = "kotlin.compiler.execution.strategy" @@ -200,12 +199,3 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil } } -internal class GradleCompilerEnvironment( - val compilerJar: File -) : CompilerEnvironment(Services.EMPTY) { - val compilerClasspath: List - get() = listOf(compilerJar).filterNotNull() - - val compilerClasspathURLs: List - get() = compilerClasspath.map { it.toURI().toURL() } -} \ No newline at end of file