Instruct platform code to use NIO2 always

since we're not always use jna (means that we can get warnings about missing jna libs)
and according to the IDEA team, NIO2 works well enough to rely on it
This commit is contained in:
Ilya Chernikov
2019-10-10 17:50:47 +02:00
parent d51291b187
commit 2568804eaa
4 changed files with 19 additions and 6 deletions
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.scripting.compiler.plugin
import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.CliScriptDefinitionProvider
import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
@@ -19,6 +20,10 @@ import kotlin.script.templates.standard.ScriptTemplateWithArgs
class ScriptProviderTest {
init {
setIdeaIoUseFallback()
}
@Test
fun testLazyScriptDefinitionsProvider() {
@@ -10,6 +10,7 @@ import junit.framework.TestCase
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoots
import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -43,6 +44,10 @@ class ScriptingCompilerPluginTest : TestCase() {
const val TEST_DATA_DIR = "plugins/scripting/scripting-compiler/testData"
}
init {
setIdeaIoUseFallback()
}
private val kotlinPaths: KotlinPaths by lazy(LazyThreadSafetyMode.PUBLICATION) {
val paths = PathUtil.kotlinPathsForDistDirectory
TestCase.assertTrue("Lib directory doesn't exist. Run 'ant dist'", paths.libPath.absoluteFile.isDirectory)
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.scripting.compiler.plugin
import junit.framework.Assert
import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
import org.junit.Test
import java.io.File
@@ -15,6 +16,10 @@ class ScriptingWithCliCompilerTest {
const val TEST_DATA_DIR = "plugins/scripting/scripting-compiler/testData"
}
init {
setIdeaIoUseFallback()
}
@Test
fun testResultValue() {
runWithK2JVMCompiler("$TEST_DATA_DIR/integration/intResult.kts", listOf("10"))