From 3e8b39af90c0b7ecaf6b3ab375bcbe3e5b865cad Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 13 Nov 2017 18:18:42 +0100 Subject: [PATCH] Move kotlin-reflect Gradle project to libraries/reflect/ --- .../tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt | 3 +-- libraries/{tools/kotlin-reflect => reflect}/build.gradle | 0 .../org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt | 2 +- settings.gradle | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) rename libraries/{tools/kotlin-reflect => reflect}/build.gradle (100%) diff --git a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt index 77bcd1cf220..42e8665d4f2 100644 --- a/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt @@ -33,8 +33,7 @@ class CodeConformanceTest : TestCase() { "libraries/kotlin.test/js/it/.gradle", "libraries/kotlin.test/js/it/node_modules", "libraries/stdlib/js/node_modules", - "libraries/tools/kotlin-reflect/build", - "libraries/tools/kotlin-reflect/target/copied-sources", + "libraries/reflect/build", "libraries/tools/binary-compatibility-validator/src/main/kotlin/org.jetbrains.kotlin.tools", "dependencies", "js/js.translator/qunit/qunit.js", diff --git a/libraries/tools/kotlin-reflect/build.gradle b/libraries/reflect/build.gradle similarity index 100% rename from libraries/tools/kotlin-reflect/build.gradle rename to libraries/reflect/build.gradle diff --git a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt index d1bbceb4411..99011da8edf 100644 --- a/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt +++ b/libraries/tools/binary-compatibility-validator/src/test/kotlin/org.jetbrains.kotlin.tools.tests/RuntimePublicAPITest.kt @@ -58,7 +58,7 @@ class RuntimePublicAPITest { } @Test fun kotlinReflect() { - snapshotAPIAndCompare("../../tools/kotlin-reflect/build/libs", "kotlin-reflect(?!-[-a-z]+)", listOf("../reflect-declarations.json"), nonPublicPackages = listOf("kotlin.reflect.jvm.internal")) + snapshotAPIAndCompare("../../reflect/build/libs", "kotlin-reflect(?!-[-a-z]+)", listOf("../reflect-declarations.json"), nonPublicPackages = listOf("kotlin.reflect.jvm.internal")) } diff --git a/settings.gradle b/settings.gradle index 74b55ca8ae5..2f094756e60 100644 --- a/settings.gradle +++ b/settings.gradle @@ -170,7 +170,7 @@ project(':kotlin-stdlib-jre8').projectDir = "$rootDir/libraries/stdlib/jre8" as project(':kotlin-stdlib-jdk7').projectDir = "$rootDir/libraries/stdlib/jdk7" as File project(':kotlin-stdlib-jdk8').projectDir = "$rootDir/libraries/stdlib/jdk8" as File project(':kotlin-stdlib:samples').projectDir = "$rootDir/libraries/stdlib/samples" as File -project(':kotlin-reflect').projectDir = "$rootDir/libraries/tools/kotlin-reflect" as File +project(':kotlin-reflect').projectDir = "$rootDir/libraries/reflect" as File project(':kotlin-compiler').projectDir = "$rootDir/prepare/compiler" as File project(':kotlin-compiler-embeddable').projectDir = "$rootDir/prepare/compiler-embeddable" as File project(':kotlin-compiler-client-embeddable').projectDir = "$rootDir/prepare/compiler-client-embeddable" as File