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

fix NPE with logger, delete extracted annotations

Browse Source
This commit is contained in:
Leonid Shalupov
2013-03-15 20:31:29 +04:00
committed by Andrey Breslav
parent 01203f6be3
commit 05285c8272
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml
+5
View File
@@ -0,0 +1,5 @@
<root>
<item name='org.gradle.api.logging.Logging org.gradle.api.logging.Logger getLogger(java.lang.Class)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
</root>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+8 -8
View File
@@ -27,6 +27,8 @@ import org.jetbrains.jet.cli.common.messages.MessageCollector
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity
import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging
import org.apache.commons.io.FileUtils
public open class KotlinCompile(): AbstractCompile() {
@@ -91,8 +93,7 @@ public open class KotlinCompile(): AbstractCompile() {
args.setSourceDirs(sources.map { it.getAbsolutePath() })
// todo: WTF absolute == gradle class path?
val gradleClasspath = getClasspath().filter(KSpec { it != null && it.isAbsolute() })
val gradleClasspath = getClasspath()
val effectiveClassPath = (javaSrcRoots + gradleClasspath).makeString(File.pathSeparator)
args.setClasspath(effectiveClassPath)
@@ -104,19 +105,17 @@ public open class KotlinCompile(): AbstractCompile() {
args.annotations = embeddedAnnotations.getPath()
args.noStdlib = true
val messageCollector = GradleMessageCollector(getLogger())
val logger = Logging.getLogger(getClass())
val messageCollector = GradleMessageCollector(logger)
val exitCode = compiler.exec(messageCollector, args)
if (embeddedAnnotations.getParentFile()?.delete() != true) {
throw GradleException("Can't delete extracted annotations " + embeddedAnnotations)
}
FileUtils.deleteDirectory(embeddedAnnotations.getParentFile());
when (exitCode) {
ExitCode.COMPILATION_ERROR -> throw GradleException("Compilation error. See log for more details")
ExitCode.INTERNAL_ERROR -> throw GradleException("Internal compiler error. See log for more details")
else -> {}
}
}
fun getAnnotations(): File {
@@ -205,7 +204,8 @@ public open class KDoc(): SourceTask() {
val compiler = KDocCompiler()
val messageCollector = GradleMessageCollector(getLogger())
val logger = Logging.getLogger(getClass())
val messageCollector = GradleMessageCollector(logger)
val exitCode = compiler.exec(messageCollector, args);
when (exitCode) {