From 97c0f1712a3af0da52f2fcc22b6c5ac589c0fe6f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 21 Aug 2018 14:03:28 +0200 Subject: [PATCH] Fix compilation in KotlinTestUtils for AS 3.1 & 3.2 --- .../org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 | 9 +++++---- .../org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 index 71958eaae62..61185860b27 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as31 @@ -40,6 +40,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettings; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.config.ContentRootsKt; +import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; @@ -609,11 +610,11 @@ public class KotlinTestUtils { } public static void resolveAllKotlinFiles(KotlinCoreEnvironment environment) throws IOException { - List paths = ContentRootsKt.getKotlinSourceRoots(environment.getConfiguration()); - if (paths.isEmpty()) return; + List roots = ContentRootsKt.getKotlinSourceRoots(environment.getConfiguration()); + if (roots.isEmpty()) return; List ktFiles = new ArrayList<>(); - for (String path : paths) { - File file = new File(path); + for (KotlinSourceRoot root : roots) { + File file = new File(root.getPath()); if (file.isFile()) { ktFiles.add(loadJetFile(environment.getProject(), file)); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 index 55cc84096ec..b56022c0f7d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java.as32 @@ -40,6 +40,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettings; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.config.ContentRootsKt; +import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; @@ -609,11 +610,11 @@ public class KotlinTestUtils { } public static void resolveAllKotlinFiles(KotlinCoreEnvironment environment) throws IOException { - List paths = ContentRootsKt.getKotlinSourceRoots(environment.getConfiguration()); - if (paths.isEmpty()) return; + List roots = ContentRootsKt.getKotlinSourceRoots(environment.getConfiguration()); + if (roots.isEmpty()) return; List ktFiles = new ArrayList<>(); - for (String path : paths) { - File file = new File(path); + for (KotlinSourceRoot root : roots) { + File file = new File(root.getPath()); if (file.isFile()) { ktFiles.add(loadJetFile(environment.getProject(), file)); }