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

KT-6165, KT-9547: fix testData for JPS plugin.

Browse Source 
Test contains effectively single module (with circular dependencies),
and should not have conflicting declarations.
Rename the package in a library used in this test.

 #KT-9547 Fixed

Original commit: 1a58636ea9
This commit is contained in:
Dmitry Petrov
2015-10-21 16:35:23 +03:00
parent 3b8d50f06e
commit abac00df69
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java → jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java
+1 -1
View File
@@ -1,4 +1,4 @@
package module1; package lib.module1;
public class JavaClass { public class JavaClass {
public static void oldJavaMethod() {} public static void oldJavaMethod() {}
jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt → jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package module1 package lib.module1
import module2.* import lib.module2.*
fun foo() { fun foo() {
JavaClass.oldJavaMethod() JavaClass.oldJavaMethod()
jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt → jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package module2 package lib.module2
public object KotlinObject { public object KotlinObject {
public fun oldKotlinMethod() { public fun oldKotlinMethod() {
jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt → jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package module2 package lib.module2
import module1.* import lib.module1.*
fun bar() { fun bar() {
JavaClass.oldJavaMethod() JavaClass.oldJavaMethod()