restore compilation after rebase of dropping external annotations; fix affected tests
This commit is contained in:
@@ -27,20 +27,10 @@ import java.io.File
|
||||
import java.util.*
|
||||
|
||||
class KotlinCompilerAdapter : Javac13() {
|
||||
|
||||
var externalAnnotations: Path? = null
|
||||
|
||||
var moduleName: String? = null
|
||||
|
||||
var additionalArguments: MutableList<Commandline.Argument> = ArrayList(0)
|
||||
|
||||
fun createExternalAnnotations(): Path {
|
||||
if (externalAnnotations == null) {
|
||||
externalAnnotations = Path(getProject())
|
||||
}
|
||||
return externalAnnotations!!.createPath()
|
||||
}
|
||||
|
||||
fun createCompilerArg(): Commandline.Argument {
|
||||
val argument = Commandline.Argument()
|
||||
additionalArguments.add(argument)
|
||||
@@ -70,8 +60,6 @@ class KotlinCompilerAdapter : Javac13() {
|
||||
// it is constructed only of sources which are newer than classes with the same name
|
||||
kotlinc.src = javac.srcdir
|
||||
|
||||
kotlinc.externalAnnotations = externalAnnotations
|
||||
|
||||
if (moduleName == null) {
|
||||
moduleName = javac.defaultModuleName
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user