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

Extract throwGradleExceptionIfError

Browse Source
This commit is contained in:
Alexey Tsvetkov
2016-12-07 15:32:14 +03:00
parent 5a846f94fc
commit 232b40eb36
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KaptTask.kt
+3 -10
View File
@@ -34,14 +34,6 @@ open class KaptTask : AbstractCompile() {
return FileUtil.isAncestor(destinationDir, this, /* strict = */ false)
}
private fun processCompilerExitCode(exitCode: ExitCode) {
when (exitCode) {
ExitCode.COMPILATION_ERROR -> throw GradleException("Annotation processing error. See log for more details")
ExitCode.INTERNAL_ERROR -> throw GradleException("Annotation processing internal error. See log for more details")
else -> {}
}
}
@TaskAction
override fun compile() {
/** Delete everything inside the [destinationDir] */
@@ -59,8 +51,9 @@ open class KaptTask : AbstractCompile() {
kotlinCompileTask.parentKotlinOptionsImpl?.updateArguments(args)
KotlinJvmOptionsImpl().updateArguments(args)
processCompilerExitCode(compileJvmNotIncrementally(compiler, logger,
val exitCode = compileJvmNotIncrementally(compiler, logger,
sourceRoots.kotlinSourceFiles, sourceRoots.javaSourceRoots, compileClasspath,
destinationDir, args))
destinationDir, args)
throwGradleExceptionIfError(exitCode)
}
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+1 -8
View File
@@ -222,14 +222,7 @@ open class KotlinCompile : AbstractKotlinCompile<K2JVMCompilerArguments>(), Kotl
cleanupOnError()
}
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")
ExitCode.SCRIPT_EXECUTION_ERROR -> throw GradleException("Script execution error. See log for more details")
ExitCode.OK -> {
logger.kotlinInfo("Compilation succeeded")
}
}
throwGradleExceptionIfError(exitCode)
}
private fun handleKaptProperties() {
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/tasksUtils.kt
+14
View File
@@ -0,0 +1,14 @@
package org.jetbrains.kotlin.gradle.tasks
import org.gradle.api.GradleException
import org.jetbrains.kotlin.cli.common.ExitCode
fun throwGradleExceptionIfError(exitCode: ExitCode) {
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")
ExitCode.SCRIPT_EXECUTION_ERROR -> throw GradleException("Script execution error. See log for more details")
ExitCode.OK -> {}
else -> throw IllegalStateException("Unexpected exit code: $exitCode")
}
}