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

JavaAgainstKotlinBinaries: Allow specifying extra compiler options

Browse Source
This commit is contained in:
Simon Ogorodnik
2018-12-07 20:36:20 +03:00
parent bd774766f1
commit 2165cfe91d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/ExtendClassWithJvmDefaultImplementation.txt
Vendored
+2 -1
View File
@@ -1,2 +1,3 @@
// LANGUAGE_LEVEL 1.8 // LANGUAGE_LEVEL 1.8
// WITH_RUNTIME // WITH_RUNTIME
// KOTLINC_EXTRA_OPTS -jvm-target, 1.8, -Xjvm-default=enable
idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt
+6 -2
View File
@@ -33,9 +33,13 @@ abstract class AbstractJavaAgainstKotlinBinariesCheckerTest : AbstractJavaAgains
if (KotlinTestUtils.isAllFilesPresentTest(testName)) { if (KotlinTestUtils.isAllFilesPresentTest(testName)) {
return return
} }
val languageLevelOption = InTextDirectivesUtils.findListWithPrefixes(configFileText ?: "", "// KOTLINC_EXTRA_OPTS")
val libraryJar = MockLibraryUtil.compileJvmLibraryToJar( val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(
PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/javaAgainstKotlin/" + getTestName(false) + ".kt", PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/javaAgainstKotlin/" + getTestName(false) + ".kt",
"libFor$testName" "libFor$testName",
extraOptions = languageLevelOption
) )
val jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.absolutePath) + "!/" val jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.absolutePath) + "!/"
ModuleRootModificationUtil.addModuleLibrary(module, jarUrl) ModuleRootModificationUtil.addModuleLibrary(module, jarUrl)