diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt.173 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt.173 deleted file mode 100644 index 7a05d9e9c08..00000000000 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt.173 +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.jps.build - -import org.jetbrains.jps.builders.java.dependencyView.Callbacks -import com.intellij.util.concurrency.FixedFuture -import java.io.File -import java.util.concurrent.Future - -class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() { - fun testJavaConstantChangedUsedInKotlin() { - doTest("jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/") - } - - fun testJavaConstantUnchangedUsedInKotlin() { - doTest("jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/") - } - - fun testKotlinConstantChangedUsedInJava() { - doTest("jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/") - } - - fun testKotlinJvmFieldChangedUsedInJava() { - doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/") - } - - fun testKotlinConstantUnchangedUsedInJava() { - doTest("jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/") - } - - fun testKotlinJvmFieldUnchangedUsedInJava() { - doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/") - } - - override val mockConstantSearch: Callbacks.ConstantAffectionResolver? - get() = object : Callbacks.ConstantAffectionResolver { - override fun request( - ownerClassName: String?, - fieldName: String?, - accessFlags: Int, - fieldRemoved: Boolean, - accessChanged: Boolean - ): Future { - // We emulate how constant affection service works in IDEA: - // it is able to find Kotlin usages of Java constant, but can't find Java usages of Kotlin constant - val affectedFiles = - when { - ownerClassName == "JavaClass" && fieldName == "CONST" -> listOf(File(workDir, "src/usage.kt")) - ownerClassName == "test.Klass" && fieldName == "CONST" -> listOf(File(workDir, "src/Usage.java")) - else -> emptyList() - } - - return FixedFuture(Callbacks.ConstantAffection(affectedFiles)) - } - } -} \ No newline at end of file diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MockJavaConstantSearch.kt.173 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MockJavaConstantSearch.kt.173 deleted file mode 100644 index 72084d3482e..00000000000 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MockJavaConstantSearch.kt.173 +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. 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 com.intellij.util.concurrency.FixedFuture -import org.jetbrains.jps.builders.java.dependencyView.Callbacks -import java.io.File -import java.util.concurrent.Future - -class MockJavaConstantSearch(private val workDir: File) : Callbacks.ConstantAffectionResolver { - override fun request( - ownerClassName: String, - fieldName: String, - accessFlags: Int, - fieldRemoved: Boolean, - accessChanged: Boolean - ): Future { - val affectedFiles = workDir.walk().filter { it.isFile && it.isNameUsage() } - return FixedFuture(Callbacks.ConstantAffection(affectedFiles.toList())) - } - - private fun File.isNameUsage(): Boolean = - name.equals("usage.kt", ignoreCase = true) - || name.equals("usage.java", ignoreCase = true) -} \ No newline at end of file diff --git a/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.173 b/jps/jps-plugin/resources/META-INF/services/org.jetbrains.jps.builders.java.JavaBuilderExtension.173 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJavaBuilderExtension.kt.173 b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJavaBuilderExtension.kt.173 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.173 b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.173 deleted file mode 100644 index c014f4b30fa..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.173 +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. 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