From 5dbadfe3764b4e4564354f4a5a29d7a521c9b632 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 12 Jan 2015 12:36:54 +0300
Subject: Update to the latest Kotlin compiler API

---
 src/Analysis/AnalysisEnvironment.kt | 18 +++++++++---------
 src/Analysis/CommentsAPI.kt         |  7 +++----
 src/Analysis/CompilerAPI.kt         | 22 ++++++++++------------
 3 files changed, 22 insertions(+), 25 deletions(-)

(limited to 'src/Analysis')

diff --git a/src/Analysis/AnalysisEnvironment.kt b/src/Analysis/AnalysisEnvironment.kt
index cc0e7184..1bf3575f 100644
--- a/src/Analysis/AnalysisEnvironment.kt
+++ b/src/Analysis/AnalysisEnvironment.kt
@@ -1,17 +1,17 @@
 package org.jetbrains.dokka
 
-import org.jetbrains.jet.cli.common.messages.*
+import org.jetbrains.kotlin.cli.common.messages.*
 import com.intellij.openapi.*
-import org.jetbrains.jet.cli.jvm.compiler.*
-import org.jetbrains.jet.lang.resolve.*
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.cli.jvm.compiler.*
+import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.psi.*
 import java.io.File
-import org.jetbrains.jet.config.*
-import org.jetbrains.jet.cli.common.*
-import org.jetbrains.jet.cli.jvm.*
+import org.jetbrains.kotlin.config.*
+import org.jetbrains.kotlin.cli.common.*
+import org.jetbrains.kotlin.cli.jvm.*
 import com.intellij.openapi.util.*
-import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
-import org.jetbrains.jet.lang.resolve.lazy.ResolveSession
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.resolve.lazy.ResolveSession
 
 /**
  * Kotlin as a service entry point
diff --git a/src/Analysis/CommentsAPI.kt b/src/Analysis/CommentsAPI.kt
index b195107a..ce453113 100644
--- a/src/Analysis/CommentsAPI.kt
+++ b/src/Analysis/CommentsAPI.kt
@@ -1,9 +1,8 @@
 package org.jetbrains.dokka
 
-import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.lang.resolve.*
-import org.jetbrains.jet.kdoc.psi.api.*
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.kdoc.psi.api.*
 
 /**
  * Retrieves PSI elements representing documentation from the [DeclarationDescriptor]
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>()
-- 
cgit