diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:30:20 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:30:20 +0100 |
| commit | 370b3913e2c629073af91bf9f63be917de2cc6d1 (patch) | |
| tree | 738b61ef94ccdecc19f9baea2a0b37b273aa3f01 /src/Analysis/CompilerAPI.kt | |
| parent | 0c584d0e12f07946fdfc8cc0e9f132558ff794fc (diff) | |
| parent | 75e1f85d92d1a0485983103dd61c46447068c20f (diff) | |
| download | dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.gz dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.bz2 dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.zip | |
Merge branch 'master' into enum-members
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>() |