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

Using isolated classloader again, but as a singleton; regular compiler jar instead of embeddable; more logging

Browse Source 
(cherry picked from commit 6801d8a)
This commit is contained in:
ligee
2015-07-23 20:48:31 +02:00
parent ee73373441
commit 3b322520bd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/pom.xml
+1 -1
View File
@@ -44,7 +44,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-compiler-embeddable</artifactId> <artifactId>kotlin-compiler</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
+3 -1
View File
@@ -35,7 +35,9 @@ abstract class KotlinBasePluginWrapper: Plugin<Project> {
project.getExtensions().getExtraProperties()?.set("kotlin.gradle.plugin.version", kotlinPluginVersion) project.getExtensions().getExtraProperties()?.set("kotlin.gradle.plugin.version", kotlinPluginVersion)
if (pluginClassLoader == null) if (pluginClassLoader == null)
pluginClassLoader = createPluginClassLoader(kotlinPluginVersion, sourceBuildScript) pluginClassLoader = createPluginIsolatedClassLoader(kotlinPluginVersion, sourceBuildScript)
else
log.kotlinDebug("Reusing classloader from previous run")
val plugin = getPlugin(pluginClassLoader!!, sourceBuildScript) val plugin = getPlugin(pluginClassLoader!!, sourceBuildScript)
plugin.apply(project) plugin.apply(project)