File tree Expand file tree Collapse file tree 4 files changed +11
-10
lines changed
main/kotlin/com/tschuchort/compiletesting
test/kotlin/com/tschuchort/compiletesting Expand file tree Collapse file tree 4 files changed +11
-10
lines changed Original file line number Diff line number Diff line change 11buildscript {
2- ext. kotlin_version = ' 1.3.11 '
2+ ext. kotlin_version = ' 1.3.21 '
33
44 repositories {
55 mavenCentral()
@@ -13,7 +13,7 @@ buildscript {
1313
1414plugins {
1515 id ' java'
16- id ' org.jetbrains.kotlin.jvm' version ' 1.3.11 '
16+ id ' org.jetbrains.kotlin.jvm' version ' 1.3.21 '
1717}
1818
1919apply plugin : ' kotlin'
Original file line number Diff line number Diff line change @@ -329,7 +329,7 @@ data class KotlinCompilation(
329329 }
330330
331331 return convertKotlinExitCode(
332- K2JVMCompiler ().execImpl (messageCollector, Services .EMPTY , k2JvmArgs))
332+ K2JVMCompiler ().exec (messageCollector, Services .EMPTY , k2JvmArgs))
333333 }
334334
335335 /* * Performs the 3rd compilation step to compile Kotlin source files */
@@ -349,7 +349,7 @@ data class KotlinCompilation(
349349 }
350350
351351 return convertKotlinExitCode(
352- K2JVMCompiler ().execImpl (messageCollector, Services .EMPTY , k2JvmArgs))
352+ K2JVMCompiler ().exec (messageCollector, Services .EMPTY , k2JvmArgs))
353353 }
354354
355355 /* *
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ internal fun <E> MutableCollection<E>.addAll(vararg elems: E) = addAll(elems)
77
88internal fun getJavaHome (): File {
99 val path = System .getProperty(" java.home" )
10+ ? : System .getenv(" JAVA_HOME" )
1011 ? : throw IllegalStateException (" no java home found" )
1112
1213 return File (path).also { check(it.isDirectory) }
Original file line number Diff line number Diff line change @@ -70,13 +70,13 @@ class KotlinTestProcessor : AbstractProcessor() {
7070
7171 if (annotations.isEmpty()) {
7272 FileSpec .builder(GENERATED_PACKAGE , GENERATED_KOTLIN_CLASS_NAME + " .kt" )
73- .addType(
74- TypeSpec .classBuilder(GENERATED_KOTLIN_CLASS_NAME ).build()
75- ).build()
76- .let { writeKotlinFile(it) }
73+ .addType(
74+ TypeSpec .classBuilder(GENERATED_KOTLIN_CLASS_NAME ).build()
75+ ).build()
76+ .let { writeKotlinFile(it) }
7777
78- JavaFile .builder(GENERATED_PACKAGE , JavaTypeSpec .classBuilder(GENERATED_JAVA_CLASS_NAME ).build())
79- .build().writeTo(processingEnv.filer)
78+ JavaFile .builder(GENERATED_PACKAGE , JavaTypeSpec .classBuilder(GENERATED_JAVA_CLASS_NAME ).build())
79+ .build().writeTo(processingEnv.filer)
8080 }
8181
8282 return false
You can’t perform that action at this time.
0 commit comments