From 55e551c03ad5b90730b9933b090aada908fa3e2e Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 20 Dec 2016 19:58:31 +0300 Subject: [PATCH] Update after separating JPS builders into two modules Original commit: 95061885b0a7dbf13873ee47228a690a912d6386 --- .../test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt index a27fba5990b..e140c09dd56 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.jps -import org.jetbrains.jps.cmdline.ClasspathBootstrap +import org.jetbrains.jps.javac.OptimizedFileManagerUtil import java.lang.reflect.Field import java.lang.reflect.Modifier fun disableJava6FileManager() { - val fileManagerClass = ClasspathBootstrap.getOptimizedFileManagerClass() + val fileManagerClass = OptimizedFileManagerUtil.getManagerClass() if (fileManagerClass?.simpleName == "OptimizedFileManager") { // JPS tests depends on idea.jar and can't be executed under Java 1.6 anymore. But currently TeamCity merges classpath from all // dependencies in a one big mess with no differences between JDK and non-JDK jars. Such behaviour causes both