Adds annotations artifact to classpath container.

Author: Kordyjan

kotlin-bundled-compiler/get_bundled.xml

@@ -192,6 +192,7 @@
     	               <include name="Kotlin/kotlinc/lib/allopen-compiler-plugin.jar"/>
                        <include name="Kotlin/kotlinc/lib/noarg-compiler-plugin.jar"/>
                        <include name="Kotlin/kotlinc/lib/sam-with-receiver-compiler-plugin.jar"/>
+                       <include name="Kotlin/kotlinc/lib/annotations-13.0.jar"/>
     	           </patternset>
     	           <mapper type="flatten"/>
     	       </unzip>

kotlin-eclipse-core/src/org/jetbrains/kotlin/core/KotlinClasspathContainer.kt

@@ -24,34 +24,34 @@ import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.jdt.core.JavaCore
 import org.jetbrains.kotlin.core.model.KotlinJavaManager
 import org.jetbrains.kotlin.core.utils.ProjectUtils
-import java.util.ArrayList
-import kotlin.jvm.JvmStatic
+import java.util.*
 
 val runtimeContainerId: IPath = Path("org.jetbrains.kotlin.core.KOTLIN_CONTAINER")
 
 fun newExportedLibraryEntry(path: IPath): IClasspathEntry = JavaCore.newLibraryEntry(path, null, null, true)
 
-public class KotlinClasspathContainer(val javaProject: IJavaProject) : IClasspathContainer {
+class KotlinClasspathContainer(val javaProject: IJavaProject) : IClasspathContainer {
     companion object {
         val CONTAINER_ENTRY: IClasspathEntry = JavaCore.newContainerEntry(runtimeContainerId)
         val LIB_RUNTIME_NAME = "kotlin-stdlib"
         val LIB_RUNTIME_SRC_NAME = "kotlin-stdlib-sources"
         val LIB_REFLECT_NAME = "kotlin-reflect"
         val LIB_SCRIPT_RUNTIME_NAME = "kotlin-script-runtime"
-        
+        val LIB_ANNOTATIONS_1_3 = "annotations-13.0"
+
         @JvmStatic
-        public fun getPathToLightClassesFolder(javaProject: IJavaProject): IPath {
-            return Path(javaProject.getProject().getName()).append(KotlinJavaManager.KOTLIN_BIN_FOLDER).makeAbsolute()
+        fun getPathToLightClassesFolder(javaProject: IJavaProject): IPath {
+            return Path(javaProject.project.name).append(KotlinJavaManager.KOTLIN_BIN_FOLDER).makeAbsolute()
         }
     }
-    
-    override public fun getClasspathEntries() : Array<IClasspathEntry> {
+
+    override fun getClasspathEntries(): Array<IClasspathEntry> {
         val entries = ArrayList<IClasspathEntry>()
 
         val kotlinBinFolderEntry = newExportedLibraryEntry(getPathToLightClassesFolder(javaProject))
         entries.add(kotlinBinFolderEntry)
-        
-        val project = javaProject.getProject()
+
+        val project = javaProject.project
         if (!ProjectUtils.isMavenProject(project) && !ProjectUtils.isGradleProject(project)) {
             val kotlinRuntimeEntry = JavaCore.newLibraryEntry(
                     LIB_RUNTIME_NAME.buildLibPath(),
@@ -60,20 +60,22 @@ public class KotlinClasspathContainer(val javaProject: IJavaProject) : IClasspat
                     true)
             val kotlinReflectEntry = newExportedLibraryEntry(LIB_REFLECT_NAME.buildLibPath())
             val kotlinScriptRuntime = newExportedLibraryEntry(LIB_SCRIPT_RUNTIME_NAME.buildLibPath())
+            val annotations13 = newExportedLibraryEntry(LIB_ANNOTATIONS_1_3.buildLibPath())
 
             entries.add(kotlinRuntimeEntry)
             entries.add(kotlinReflectEntry)
             entries.add(kotlinScriptRuntime)
+            entries.add(annotations13)
         }
 
         return entries.toTypedArray()
     }
-    
-    override public fun getDescription() : String = "Kotlin Runtime Library"
-    
-    override public fun getKind() : Int = IClasspathContainer.K_APPLICATION
-    
-    override public fun getPath() : IPath = runtimeContainerId
+
+    override fun getDescription(): String = "Kotlin Runtime Library"
+
+    override fun getKind(): Int = IClasspathContainer.K_APPLICATION
+
+    override fun getPath(): IPath = runtimeContainerId
 }
 
 fun String.buildLibPath(): Path = Path(ProjectUtils.buildLibPath(this))