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

Compilation fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-10 12:57:22 +04:00
parent 5a27317baf
commit 14a6cdf458
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/collections/Exceptions.kt
+1 -1
View File
@@ -2,4 +2,4 @@ package kotlin
public class EmptyIterableException(val it : Iterable<*>) : RuntimeException("$it is empty")
public class DuplicateKeyException(val message : String = "Duplicate keys detected") : RuntimeException(message)
public class DuplicateKeyException(message : String = "Duplicate keys detected") : RuntimeException(message)
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+10 -8
View File
@@ -34,7 +34,9 @@ public open class KotlinCompile(): AbstractCompile() {
val srcDirsRoots = HashSet<File>()
val compiler = K2JVMCompiler()
val logger = Logging.getLogger(getClass())
private val _logger = Logging.getLogger(getClass())
override fun getLogger() = _logger
public var kotlinOptions: K2JVMCompilerArguments = K2JVMCompilerArguments();
@@ -111,7 +113,7 @@ public open class KotlinCompile(): AbstractCompile() {
args.outputDir = if (StringUtils.isEmpty(kotlinOptions.outputDir)) { kotlinDestinationDir?.getPath() } else { kotlinOptions.outputDir }
val embeddedAnnotations = getAnnotations(getProject(), logger)
val embeddedAnnotations = getAnnotations(getProject(), getLogger())
val userAnnotations = (kotlinOptions.annotations ?: "").split(File.pathSeparatorChar).toList()
val allAnnotations = if (kotlinOptions.noJdkAnnotations) userAnnotations else userAnnotations.plus(embeddedAnnotations.map {it.getPath()})
args.annotations = allAnnotations.makeString(File.pathSeparator)
@@ -124,7 +126,7 @@ public open class KotlinCompile(): AbstractCompile() {
throw GradleException(CompilerArgumentsUtil.getWrongInlineOptionErrorMessage(args.inline))
}
val messageCollector = GradleMessageCollector(logger)
val messageCollector = GradleMessageCollector(getLogger())
getLogger().debug("Calling compiler")
val exitCode = compiler.exec(messageCollector, args)
@@ -145,8 +147,8 @@ public open class KotlinCompile(): AbstractCompile() {
public open class KDoc(): SourceTask() {
val logger = Logging.getLogger(getClass())
private val _logger = Logging.getLogger(getClass())
override fun getLogger() = _logger
public var kdocArgs: KDocArguments = KDocArguments()
@@ -179,8 +181,8 @@ public open class KDoc(): SourceTask() {
// Drop compiled sources to temp. Why KDoc compiles anything after all?!
args.outputDir = getTemporaryDir()?.getAbsolutePath()
logger.warn(args.src)
val embeddedAnnotations = getAnnotations(getProject(), logger)
getLogger().warn(args.src)
val embeddedAnnotations = getAnnotations(getProject(), getLogger())
val userAnnotations = (kdocArgs.annotations ?: "").split(File.pathSeparatorChar).toList()
val allAnnotations = if (kdocArgs.noJdkAnnotations) userAnnotations else userAnnotations.plus(embeddedAnnotations.map {it.getPath()})
args.annotations = allAnnotations.makeString(File.pathSeparator)
@@ -191,7 +193,7 @@ public open class KDoc(): SourceTask() {
val compiler = KDocCompiler()
val messageCollector = GradleMessageCollector(logger)
val messageCollector = GradleMessageCollector(getLogger())
val exitCode = compiler.exec(messageCollector, args);
when (exitCode) {