Allow to use Kotlin reflection in all modules with Kotlin
This commit is contained in:
Generated
+1
@@ -2,6 +2,7 @@
|
||||
<library name="kotlin-runtime">
|
||||
<CLASSES>
|
||||
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
|
||||
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
</condition>
|
||||
|
||||
<property name="bootstrap.runtime" location="${dependencies.dir}/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-runtime.jar"/>
|
||||
<property name="bootstrap.reflect" location="${dependencies.dir}/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar"/>
|
||||
|
||||
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${dependencies.dir}/ant-contrib.jar"/>
|
||||
|
||||
@@ -45,8 +46,15 @@
|
||||
<isset property="bootstrap.or.local.build"/>
|
||||
</condition>
|
||||
|
||||
<condition property="reflect.to.copy"
|
||||
value="${bootstrap.reflect}"
|
||||
else="${basedir}/../dist/kotlinc/lib/kotlin-reflect.jar">
|
||||
<isset property="bootstrap.or.local.build"/>
|
||||
</condition>
|
||||
|
||||
<!--suppress AntResolveInspection -->
|
||||
<copy file="${runtime.to.copy}" tofile="${artifact.output.path}/lib/kotlin-runtime.jar"/>
|
||||
<copy file="${reflect.to.copy}" tofile="${artifact.output.path}/lib/kotlin-reflect.jar"/>
|
||||
</target>
|
||||
|
||||
<target name="copy-runtime-for-jps-plugin" if="bootstrap.or.local.build">
|
||||
@@ -55,6 +63,7 @@
|
||||
<!--suppress AntResolveInspection -->
|
||||
<jar update="true" destfile="${artifact.output.path}/kotlin-jps-plugin.jar">
|
||||
<zipgroupfileset file="${bootstrap.runtime}"/>
|
||||
<zipgroupfileset file="${bootstrap.reflect}"/>
|
||||
</jar>
|
||||
</target>
|
||||
</project>
|
||||
|
||||
@@ -223,7 +223,7 @@
|
||||
|
||||
<fileTypeFactory implementation="org.jetbrains.kotlin.idea.JetFileFactory"/>
|
||||
|
||||
<compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-plugin.jar"/>
|
||||
<compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-plugin.jar"/>
|
||||
<compiler.task execute="BEFORE" implementation="org.jetbrains.kotlin.idea.internal.makeBackup.MakeBackupCompileTask"/>
|
||||
<buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ public class BareJpsPluginRegistrar : ApplicationComponent {
|
||||
}
|
||||
else {
|
||||
val compileServerPlugin = CompileServerPlugin()
|
||||
compileServerPlugin.setClasspath("jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-bare-plugin.jar")
|
||||
compileServerPlugin.setClasspath("jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-bare-plugin.jar")
|
||||
compileServerPlugin.setPluginDescriptor(PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin.bare")))
|
||||
|
||||
Extensions.getRootArea()
|
||||
|
||||
Reference in New Issue
Block a user