From baf8cb6e9ba1f42ba66cba4bef5d9569793eb004 Mon Sep 17 00:00:00 2001 From: Leonid Startsev Date: Mon, 24 Sep 2018 19:49:42 +0300 Subject: [PATCH] Replace imported serialization-ide.jar with serialization-compiler.jar so JPS build also start working --- .../serialization/idea/KotlinSerializationImportHandler.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt b/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt index 687481cee99..7e923fb5c8a 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/KotlinSerializationImportHandler.kt @@ -16,14 +16,14 @@ package org.jetbrains.kotlinx.serialization.idea -import com.intellij.util.PathUtil +import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.idea.facet.KotlinFacet import java.io.File internal object KotlinSerializationImportHandler { - val PLUGIN_JPS_JAR :String - get() = File(PathUtil.getJarPathForClass(this::class.java)).absolutePath + val PLUGIN_JPS_JAR: String + get() = File(PathUtil.kotlinPathsForIdeaPlugin.libPath, "kotlinx-serialization-compiler-plugin.jar").absolutePath fun modifyCompilerArguments(facet: KotlinFacet, buildSystemPluginJar: String) { val facetSettings = facet.configuration.settings