From 74271cfecdf2c1ea2264b432bc85bc0c10165a07 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Mon, 29 Oct 2018 15:10:11 +0300 Subject: [PATCH] JPS: Use module name from compiler arguments (JVM) --- .../src/org/jetbrains/kotlin/jps/incremental/local.kt | 2 +- .../src/org/jetbrains/kotlin/jps/incremental/lookups.kt | 2 +- .../kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt | 7 +++++++ .../kotlin/jps/targets/KotlinModuleBuildTarget.kt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt index 405793d5893..4ec2b9bfce0 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.jps.incremental import java.io.File -private val NORMAL_VERSION = 9 +private val NORMAL_VERSION = 10 private val NORMAL_VERSION_FILE_NAME = "format-version.txt" fun localCacheVersionManager(dataRoot: File, isCachesEnabled: Boolean) = diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt index 7c06d54a3e4..8821c18afc2 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/lookups.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.jps.incremental import java.io.File private val DATA_CONTAINER_VERSION_FILE_NAME = "data-container-format-version.txt" -private val DATA_CONTAINER_VERSION = 3 +private val DATA_CONTAINER_VERSION = 4 fun lookupsCacheVersionManager(dataRoot: File, isEnabled: Boolean) = CacheVersionManager( diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt index e5c5653819b..d24a71ec0ff 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt @@ -63,6 +63,13 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB override val buildMetaInfoFileName get() = JVM_BUILD_META_INFO_FILE_NAME + override val targetId: TargetId + get() { + val moduleName = module.k2JvmCompilerArguments.moduleName + return if (moduleName != null) TargetId(moduleName, jpsModuleBuildTarget.targetType.typeId) + else super.targetId + } + override fun makeServices( builder: Services.Builder, incrementalCaches: Map, JpsIncrementalCache>, diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt index ec8c5b41205..f0e54ee51c2 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinModuleBuildTarget.kt @@ -80,7 +80,7 @@ abstract class KotlinModuleBuildTarget intern val isTests: Boolean get() = jpsModuleBuildTarget.isTests - val targetId: TargetId + open val targetId: TargetId get() { // Since IDEA 2016 each gradle source root is imported as a separate module. // One gradle module X is imported as two JPS modules: