azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove support for 'trait' keyword

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt
+2 -2
View File
@@ -16,10 +16,10 @@
package org.jetbrains.kotlin.jps.build package org.jetbrains.kotlin.jps.build
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.jps.incremental.CompileContext 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 getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String>
public fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String> public fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List<String>
} }
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
+2 -2
View File
@@ -35,7 +35,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
""" """
package m1; package m1;
trait K { interface K {
} }
""") """)
createFile("m1/J.java", createFile("m1/J.java",
@@ -53,7 +53,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
import m1.J; import m1.J;
import m1.K; import m1.K;
trait M2: J { interface M2: J {
override fun bar(): K override fun bar(): K
} }
""") """)
jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package module package module
public trait A { public interface A {
fun oldFun(): Int = 1 fun oldFun(): Int = 1
fun newFun(): Int = 42 fun newFun(): Int = 42
} }
jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package module package module
public trait A { public interface A {
fun oldFun(): Int = 1 fun oldFun(): Int = 1
} }
jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package test package test
trait Trait { interface Trait {
companion object { companion object {
// Old and new constant values are different, but their hashes are the same // Old and new constant values are different, but their hashes are the same
val CONST = "BF" val CONST = "BF"
jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new
+1 -1
View File
@@ -1,6 +1,6 @@
package test package test
trait Trait { interface Trait {
companion object { companion object {
// Old and new constant values are different, but their hashes are the same // Old and new constant values are different, but their hashes are the same
val CONST = "Ae" val CONST = "Ae"