Use kotlin.modules.* instead of jet.modules.*

This commit is contained in:
Alexander Udalov
2014-02-01 18:53:27 +04:00
parent c34e5f3f39
commit 004c289a0b
9 changed files with 21 additions and 90 deletions
@@ -5,8 +5,7 @@ import java.util.ArrayList
public fun module(name: String, outputDir: String, callback: ModuleBuilder.() -> Unit) {
val builder = ModuleBuilder(name, outputDir)
builder.callback()
jet.modules.AllModules.modules.get()?.add(builder)
kotlin.modules.AllModules.get()?.add(builder)
AllModules.get()?.add(builder)
}
class SourcesBuilder(val parent: ModuleBuilder) {
@@ -27,7 +26,7 @@ class AnnotationsPathBuilder(val parent: ModuleBuilder) {
}
}
open class ModuleBuilder(val name: String, val outputDir: String): jet.modules.Module, kotlin.modules.Module {
open class ModuleBuilder(val name: String, val outputDir: String): Module {
// http://youtrack.jetbrains.net/issue/KT-904
private val sourceFiles0 = ArrayList<String>()
private val classpathRoots0 = ArrayList<String>()