From 14c45372ee574e657b00615d3b5f36c11b3b7250 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 18 Sep 2015 16:17:02 +0200
Subject: [PATCH] remove support for 'trait' keyword

Original commit: 4ca434da54e01c0b2a5b1cd2a8daadf643475430
---
 .../kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt    | 4 ++--
 .../jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt    | 4 ++--
 .../general/DependencyToOldKotlinLib/module/src/module/A.kt   | 2 +-
 .../DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt     | 2 +-
 .../pureKotlin/traitClassObjectConstantChanged/const.kt       | 2 +-
 .../pureKotlin/traitClassObjectConstantChanged/const.kt.new   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt
index 5b9286bd4f7..f4709719d65 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt
@@ -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>
 }
\ No newline at end of file
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
index ef23610fde3..3b1a7f395b5 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
@@ -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
                                     }
                                """)
diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt
index b57a44e4536..3314395f737 100644
--- a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt
+++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt
@@ -1,6 +1,6 @@
 package module
 
-public trait A {
+public interface  A {
     fun oldFun(): Int = 1
     fun newFun(): Int = 42
 }
diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt
index 0a6c17d7a78..a54a9569787 100644
--- a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt
+++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt
@@ -1,5 +1,5 @@
 package module
 
-public trait A {
+public interface A {
     fun oldFun(): Int = 1
 }
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
index 073204a43e1..6d7566e3856 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
@@ -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"
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
index 86cc1439efd..23bfae9ef54 100644
--- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
@@ -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"