diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-12-28 14:28:38 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-12-28 14:29:05 +0100 |
| commit | a8e2cfeea9551fd977d161cf3ea6210b9042a3bd (patch) | |
| tree | c0cf0a7bb60024e7dbe8a15fe9058453cbb79f25 /core | |
| parent | 1e88cdea811ca6ebb716f97010e4268e44cd66ef (diff) | |
| download | dokka-a8e2cfeea9551fd977d161cf3ea6210b9042a3bd.tar.gz dokka-a8e2cfeea9551fd977d161cf3ea6210b9042a3bd.tar.bz2 dokka-a8e2cfeea9551fd977d161cf3ea6210b9042a3bd.zip | |
update for Kotlin beta 4
Diffstat (limited to 'core')
| -rw-r--r-- | core/build.gradle | 1 | ||||
| -rw-r--r-- | core/src/main/kotlin/Kotlin/KotlinLanguageService.kt | 2 | ||||
| -rw-r--r-- | core/src/main/kotlin/main.kt | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/build.gradle b/core/build.gradle index c7313278..28e1f895 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -51,6 +51,7 @@ dependencies { runtime files("../lib/jps-model.jar") testCompile group: 'junit', name: 'junit', version: '4.11' + testCompile group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit', version: kotlin_version } tasks.withType(AbstractCompile) { diff --git a/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt b/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt index 0d39f410..4aa36b36 100644 --- a/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt +++ b/core/src/main/kotlin/Kotlin/KotlinLanguageService.kt @@ -59,7 +59,7 @@ class KotlinLanguageService : LanguageService { if (qNames.size != size) return null - return ReceiverKind.values.firstOrNull { kind -> qNames.all { it in kind.classes } } + return ReceiverKind.values().firstOrNull { kind -> qNames.all { it in kind.classes } } } private fun DocumentationNode.getReceiverQName(): String? { diff --git a/core/src/main/kotlin/main.kt b/core/src/main/kotlin/main.kt index 22e82991..c0a24caf 100644 --- a/core/src/main/kotlin/main.kt +++ b/core/src/main/kotlin/main.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzerForTopLevel import org.jetbrains.kotlin.resolve.TopDownAnalysisMode import org.jetbrains.kotlin.utils.PathUtil import java.io.File -import kotlin.util.measureTimeMillis +import kotlin.system.measureTimeMillis class DokkaArguments { @set:Argument(value = "src", description = "Source file or directory (allows many paths separated by the system path separator)") |