diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183 deleted file mode 100644 index b463decc3e8..00000000000 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.183 +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.config - -import org.jetbrains.jps.model.ex.JpsElementTypeBase -import org.jetbrains.jps.model.java.JavaResourceRootProperties -import org.jetbrains.jps.model.java.JavaResourceRootType -import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.jps.model.module.JpsModuleSourceRootType - -sealed class KotlinResourceRootType(val isTest: Boolean) : JpsElementTypeBase(), - JpsModuleSourceRootType, KotlinRootType { - - override fun createDefaultProperties() = - JpsJavaExtensionService.getInstance().createResourceRootProperties("", false) - - override fun isTestRoot() = isTest - - override fun isForTests() = isTest - - override fun equals(other: Any?) = if (super.equals(other)) true else isSameRootType(this, other) -} - -object ResourceKotlinRootType : KotlinResourceRootType(false) -object TestResourceKotlinRootType : KotlinResourceRootType(true) - -val ALL_KOTLIN_RESOURCE_ROOT_TYPES = setOf(ResourceKotlinRootType, TestResourceKotlinRootType) \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.as34 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.as34 deleted file mode 100644 index 68a27ba200a..00000000000 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinResourceRootType.kt.as34 +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.config - -import org.jetbrains.jps.model.ex.JpsElementTypeBase -import org.jetbrains.jps.model.java.JavaResourceRootProperties -import org.jetbrains.jps.model.java.JavaResourceRootType -import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.jps.model.module.JpsModuleSourceRootType - -sealed class KotlinResourceRootType(val isTest: Boolean) : JpsElementTypeBase(), - JpsModuleSourceRootType, KotlinRootType { - - override fun createDefaultProperties() = - JpsJavaExtensionService.getInstance().createResourceRootProperties("", false) - - override fun isTestRoot() = isTest - - override fun equals(other: Any?) = if (super.equals(other)) true else isSameRootType(this, other) -} - -object ResourceKotlinRootType : KotlinResourceRootType(false) -object TestResourceKotlinRootType : KotlinResourceRootType(true) - -val ALL_KOTLIN_RESOURCE_ROOT_TYPES = setOf(ResourceKotlinRootType, TestResourceKotlinRootType) \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.183 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.183 deleted file mode 100644 index a2549ea2e2c..00000000000 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinRootType.kt.183 +++ /dev/null @@ -1,24 +0,0 @@ -package org.jetbrains.kotlin.config - -import org.jetbrains.jps.model.java.JavaResourceRootType -import org.jetbrains.jps.model.java.JavaSourceRootType - -interface KotlinRootType { - fun isTestRoot(): Boolean -} - -//Hack required to fix critical bug KT-27718 it should be removed after support of source root types other than JavaSourceRootType in Idea Core -fun isSameRootType(kotlinRoot: KotlinRootType, other: Any?): Boolean { - if (kotlinRoot.isTestRoot()) { - if (other is JavaResourceRootType || other is JavaSourceRootType) { - val invokeLevel = 3 - val stack = Thread.currentThread().stackTrace - if (stack.size > invokeLevel && "isTestSource" == stack[invokeLevel].methodName && "com.intellij.openapi.roots.impl.SourceFolderImpl" == stack[invokeLevel].className) { - if (JavaResourceRootType.TEST_RESOURCE == other || JavaSourceRootType.TEST_SOURCE == other) { - return true - } - } - } - } - return false -} diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183 deleted file mode 100644 index 2636a916213..00000000000 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.183 +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.config - -import org.jetbrains.jps.model.ex.JpsElementTypeBase -import org.jetbrains.jps.model.java.JavaSourceRootProperties -import org.jetbrains.jps.model.java.JavaSourceRootType -import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.jps.model.module.JpsModuleSourceRootType - -sealed class KotlinSourceRootType(val isTest: Boolean) : JpsElementTypeBase(), JpsModuleSourceRootType, KotlinRootType { - - - override fun createDefaultProperties() = JpsJavaExtensionService.getInstance().createSourceRootProperties("") - - - override fun isTestRoot() = isTest - - override fun isForTests() = isTest - - override fun equals(other: Any?) = if (super.equals(other)) true else isSameRootType(this, other) -} - -object SourceKotlinRootType : KotlinSourceRootType(false) - -object TestSourceKotlinRootType : KotlinSourceRootType(true) - -val ALL_KOTLIN_SOURCE_ROOT_TYPES = setOf(SourceKotlinRootType, TestSourceKotlinRootType) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.as34 b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.as34 deleted file mode 100644 index 07d7033c5d1..00000000000 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinSourceRootType.kt.as34 +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.config - -import org.jetbrains.jps.model.ex.JpsElementTypeBase -import org.jetbrains.jps.model.java.JavaSourceRootProperties -import org.jetbrains.jps.model.java.JavaSourceRootType -import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.jps.model.module.JpsModuleSourceRootType - -sealed class KotlinSourceRootType(val isTest: Boolean) : JpsElementTypeBase(), JpsModuleSourceRootType, KotlinRootType { - - - override fun createDefaultProperties() = JpsJavaExtensionService.getInstance().createSourceRootProperties("") - - - override fun isTestRoot() = isTest - - fun isForTests() = isTest - - override fun equals(other: Any?) = if (super.equals(other)) true else isSameRootType(this, other) -} - -object SourceKotlinRootType : KotlinSourceRootType(false) - -object TestSourceKotlinRootType : KotlinSourceRootType(true) - -val ALL_KOTLIN_SOURCE_ROOT_TYPES = setOf(SourceKotlinRootType, TestSourceKotlinRootType) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as34 b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as34 deleted file mode 100644 index 6546b2059d2..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as34 +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.jps.build - -import org.jetbrains.jps.incremental.CompileContext -import org.jetbrains.jps.incremental.messages.CompilerMessage - -fun jpsReportInternalBuilderError(context: CompileContext, error: Throwable) { - KotlinBuilder.LOG.info(error) -} \ No newline at end of file