From f05e9266705b7dfc64cedd5eedc66605e6ddcb64 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 31 Jan 2018 15:51:11 +0300 Subject: [PATCH] Update idea to 173.3.4 (173.4548.28) --- ...ementalJvmCompilerRunnerTestGenerated.java | 6 ++++++ .../build/IncrementalJpsTestGenerated.java | 6 ++++++ .../changeSignaturePackagePrivate/build.log | 11 +--------- .../gradle-build.log | 7 +++++++ .../JavaClass.java | 7 +++++++ .../JavaClass.java.new | 7 +++++++ .../build.log | 21 +++++++++++++++++++ .../notUsage.kt | 7 +++++++ .../usage.kt | 7 +++++++ versions.gradle.kts | 2 +- 10 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt create mode 100644 jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java index d61e17e3f84..537519d2cfe 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java @@ -1121,6 +1121,12 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } + @TestMetadata("changeSignaturePackagePrivateNonRoot") + public void testChangeSignaturePackagePrivateNonRoot() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/"); + doTest(fileName); + } + @TestMetadata("changeSignatureStatic") public void testChangeSignatureStatic() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/"); diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 0a075f1be94..15692683960 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -962,6 +962,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("changeSignaturePackagePrivateNonRoot") + public void testChangeSignaturePackagePrivateNonRoot() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/"); + doTest(fileName); + } + @TestMetadata("changeSignatureStatic") public void testChangeSignatureStatic() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic/"); diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log index 6acfcd2c480..0e831894bf3 100644 --- a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/build.log @@ -7,13 +7,4 @@ Exit code: NOTHING_DONE ------------------------------------------ Compiling files: src/JavaClass.java -End of files -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/UsageKt.class -End of files -Compiling files: - src/usage.kt -End of files -Exit code: OK ------------------------------------------- +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log new file mode 100644 index 00000000000..91d6b204d11 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate/gradle-build.log @@ -0,0 +1,7 @@ +================ Step #1 ================= + +Compiling files: + src/usage.kt +End of files +Exit code: OK + diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java new file mode 100644 index 00000000000..55262a600a8 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java @@ -0,0 +1,7 @@ +public class JavaClass { + public void foo() { + } + + public void bar() { + } +} diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new new file mode 100644 index 00000000000..4ffae8c6aff --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/JavaClass.java.new @@ -0,0 +1,7 @@ +public class JavaClass { + void foo() { + } + + public void bar() { + } +} diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log new file mode 100644 index 00000000000..6e69a8d9da1 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/build.log @@ -0,0 +1,21 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/JavaClass.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/JavaClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/second/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'foo': it is public/*package*/ in 'JavaClass' \ No newline at end of file diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt new file mode 100644 index 00000000000..ac987ea20eb --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/notUsage.kt @@ -0,0 +1,7 @@ +package first + +import JavaClass + +fun main(args: Array) { + JavaClass().bar() +} diff --git a/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt new file mode 100644 index 00000000000..a8120885580 --- /dev/null +++ b/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot/usage.kt @@ -0,0 +1,7 @@ +package second + +import JavaClass + +fun main(args: Array) { + JavaClass().foo() +} diff --git a/versions.gradle.kts b/versions.gradle.kts index b361c5ed39e..2c2d5a28cd6 100644 --- a/versions.gradle.kts +++ b/versions.gradle.kts @@ -1,5 +1,5 @@ -extra["versions.intellijSdk"] = "173.4127.27" +extra["versions.intellijSdk"] = "173.4548.28" extra["versions.androidBuildTools"] = "r23.0.1" extra["versions.idea.NodeJS"] = "172.3757.32" //extra["versions.androidStudioRelease"] = "3.1.0.5"