azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update after separating JPS builders into two modules

Browse Source 
Original commit: 95061885b0
This commit is contained in:
Nikolay Krasko
2016-12-20 19:58:31 +03:00
committed by Dmitry Jemerov
parent efc1164489
commit 55e551c03a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt
+2 -2
View File
@@ -16,12 +16,12 @@
package org.jetbrains.kotlin.jps 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.Field
import java.lang.reflect.Modifier import java.lang.reflect.Modifier
fun disableJava6FileManager() { fun disableJava6FileManager() {
val fileManagerClass = ClasspathBootstrap.getOptimizedFileManagerClass() val fileManagerClass = OptimizedFileManagerUtil.getManagerClass()
if (fileManagerClass?.simpleName == "OptimizedFileManager") { 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 // 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 // dependencies in a one big mess with no differences between JDK and non-JDK jars. Such behaviour causes both