diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:27:41 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:27:41 +0100 |
| commit | 7158019f4a15c8d78faa888666accf8448aff0d4 (patch) | |
| tree | c212aad1d709b8f62a5aac5f9782eeeaa50d68e0 /src/Analysis/CompilerAPI.kt | |
| parent | 49feb9021ca24150257caac4a62af5628f52b6b5 (diff) | |
| parent | 5dbadfe3764b4e4564354f4a5a29d7a521c9b632 (diff) | |
| download | dokka-7158019f4a15c8d78faa888666accf8448aff0d4.tar.gz dokka-7158019f4a15c8d78faa888666accf8448aff0d4.tar.bz2 dokka-7158019f4a15c8d78faa888666accf8448aff0d4.zip | |
Merge branch 'jet' of https://github.com/udalov/dokka into udalov-jet
Conflicts:
src/Kotlin/DocumentationBuilder.kt
test/src/TestAPI.kt
Diffstat (limited to 'src/Analysis/CompilerAPI.kt')
| -rw-r--r-- | src/Analysis/CompilerAPI.kt | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/Analysis/CompilerAPI.kt b/src/Analysis/CompilerAPI.kt index 8216c549..20e91e1d 100644 --- a/src/Analysis/CompilerAPI.kt +++ b/src/Analysis/CompilerAPI.kt @@ -1,19 +1,17 @@ package org.jetbrains.dokka -import org.jetbrains.jet.cli.common.arguments.* -import org.jetbrains.jet.cli.jvm.compiler.* -import org.jetbrains.jet.utils.* +import org.jetbrains.kotlin.cli.common.arguments.* +import org.jetbrains.kotlin.cli.jvm.compiler.* +import org.jetbrains.kotlin.utils.* import java.io.* -import org.jetbrains.jet.lang.resolve.java.* -import org.jetbrains.jet.lang.resolve.* -import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.analyzer.* -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.scopes.* -import org.jetbrains.jet.context.GlobalContext +import org.jetbrains.kotlin.resolve.jvm.* +import org.jetbrains.kotlin.analyzer.* +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.resolve.scopes.* +import org.jetbrains.kotlin.context.GlobalContext import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.resolve.lazy.ResolveSession +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.resolve.lazy.ResolveSession private fun getAnnotationsPath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): MutableList<File> { val annotationsPath = arrayListOf<File>() |