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

as31: KotlinTestUtils: resolving PathUtil conflict

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-02-06 23:24:03 +03:00
committed by Nikolay Krasko
parent 0f6df38211
commit 60fe6a911f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31
+1 -2
View File
@@ -26,7 +26,6 @@ import com.intellij.psi.impl.PsiFileFactoryImpl;
import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.testFramework.LightVirtualFile; import com.intellij.testFramework.LightVirtualFile;
import com.intellij.testFramework.TestDataFile; import com.intellij.testFramework.TestDataFile;
import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtil;
import junit.framework.TestCase; import junit.framework.TestCase;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
@@ -385,7 +384,7 @@ public class KotlinTestUtils {
} }
public static String getAndroidSdkSystemIndependentPath() { public static String getAndroidSdkSystemIndependentPath() {
return PathUtil.toSystemIndependentName(findAndroidSdk().getAbsolutePath()); return com.intellij.util.PathUtil.toSystemIndependentName(findAndroidSdk().getAbsolutePath());
} }
public static File getAnnotationsJar() { public static File getAnnotationsJar() {