remove support for 'trait' keyword

Original commit: 4ca434da54
This commit is contained in:
Dmitry Jemerov
2015-09-18 16:17:02 +02:00
parent ff54b362ea
commit 14c45372ee
6 changed files with 8 additions and 8 deletions
@@ -16,10 +16,10 @@
package org.jetbrains.kotlin.jps.build
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.jps.incremental.CompileContext
import org.jetbrains.jps.incremental.ModuleBuildTarget
public trait KotlinJpsCompilerArgumentsProvider {
public interface KotlinJpsCompilerArgumentsProvider {
public fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String>
public fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String>
}
@@ -35,7 +35,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
"""
package m1;
trait K {
interface K {
}
""")
createFile("m1/J.java",
@@ -53,7 +53,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
import m1.J;
import m1.K;
trait M2: J {
interface M2: J {
override fun bar(): K
}
""")
@@ -1,6 +1,6 @@
package module
public trait A {
public interface A {
fun oldFun(): Int = 1
fun newFun(): Int = 42
}
@@ -1,5 +1,5 @@
package module
public trait A {
public interface A {
fun oldFun(): Int = 1
}
@@ -1,6 +1,6 @@
package test
trait Trait {
interface Trait {
companion object {
// Old and new constant values are different, but their hashes are the same
val CONST = "BF"
@@ -1,6 +1,6 @@
package test
trait Trait {
interface Trait {
companion object {
// Old and new constant values are different, but their hashes are the same
val CONST = "Ae"