From 5f5daa0e062dc5045818316d6030876d3785afcd Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 1 Nov 2023 11:15:58 +0100 Subject: [PATCH] [Decompiler] rename `:analysis:decompiled:native` -> `:analysis:decompiled:decompiler-native` to avoid possible name clashes between different Gradle subprojects with the same name. see https://github.com/gradle/gradle/issues/16986 --- analysis/analysis-api-impl-base/build.gradle.kts | 2 +- analysis/analysis-api-providers/build.gradle.kts | 2 +- analysis/build.gradle.kts | 2 +- .../decompiled/{native => decompiler-native}/build.gradle.kts | 0 .../analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt | 0 .../analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt | 0 .../analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt | 0 .../kotlin/analysis/decompiler/konan/FileWithMetadata.kt | 0 .../analysis/decompiler/konan/K2KlibMetadataDecompiler.kt | 0 .../analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt | 0 .../decompiler/konan/K2KotlinNativeMetadataDecompiler.kt | 0 .../kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt | 0 .../analysis/decompiler/konan/KlibLoadingMetadataCache.kt | 0 .../kotlin/analysis/decompiler/konan/KlibMetaFileType.kt | 0 .../kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt | 0 .../decompiler/konan/KlibMetadataDeserializerForDecompiler.kt | 0 .../kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt | 0 .../analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt | 0 .../konan/AbstractDecompiledKnmStubConsistencyTest.kt | 0 .../konan/DecompiledKnmStubConsistencyFe10TestGenerated.java | 0 .../konan/DecompiledKnmStubConsistencyK2TestGenerated.java | 0 build.gradle.kts | 2 +- generators/analysis-api-generator/build.gradle.kts | 2 +- .../kotlin/generators/tests/analysis/api/decompiled.kt | 2 +- settings.gradle | 2 +- 25 files changed, 7 insertions(+), 7 deletions(-) rename analysis/decompiled/{native => decompiler-native}/build.gradle.kts (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/FileWithMetadata.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataDecompiler.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibLoadingMetadataCache.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDeserializerForDecompiler.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt (100%) rename analysis/decompiled/{native => decompiler-native}/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt (100%) rename analysis/decompiled/{native => decompiler-native}/tests/org/jetbrains/kotlin/analysis/decompiler/konan/AbstractDecompiledKnmStubConsistencyTest.kt (100%) rename analysis/decompiled/{native => decompiler-native}/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyFe10TestGenerated.java (100%) rename analysis/decompiled/{native => decompiler-native}/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyK2TestGenerated.java (100%) diff --git a/analysis/analysis-api-impl-base/build.gradle.kts b/analysis/analysis-api-impl-base/build.gradle.kts index e398325bce5..701378db90b 100644 --- a/analysis/analysis-api-impl-base/build.gradle.kts +++ b/analysis/analysis-api-impl-base/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(project(":analysis:decompiled:light-classes-for-decompiled")) testImplementation(project(":analysis:decompiled:decompiler-to-psi")) - testImplementation(project(":analysis:decompiled:native")) + testImplementation(project(":analysis:decompiled:decompiler-native")) testImplementation(projectTests(":analysis:analysis-test-framework")) testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false } testImplementation(toolsJar()) diff --git a/analysis/analysis-api-providers/build.gradle.kts b/analysis/analysis-api-providers/build.gradle.kts index c8599b61706..ee2c30f0551 100644 --- a/analysis/analysis-api-providers/build.gradle.kts +++ b/analysis/analysis-api-providers/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { implementation(project(":analysis:project-structure")) implementation(project(":analysis:decompiled:decompiler-to-file-stubs")) implementation(project(":analysis:decompiled:decompiler-to-psi")) - implementation(project(":analysis:decompiled:native")) + implementation(project(":analysis:decompiled:decompiler-native")) implementation(intellijCore()) } diff --git a/analysis/build.gradle.kts b/analysis/build.gradle.kts index ffc2fd4a9d3..61d23c3ec43 100644 --- a/analysis/build.gradle.kts +++ b/analysis/build.gradle.kts @@ -6,7 +6,7 @@ tasks.register("analysisAllTests") { dependsOn( ":analysis:decompiled:decompiler-to-file-stubs:test", ":analysis:decompiled:decompiler-to-psi:test", - ":analysis:decompiled:native:test", + ":analysis:decompiled:decompiler-native:test", ":analysis:analysis-api:test", ":analysis:analysis-api-fir:test", ":analysis:analysis-api-fe10:test", diff --git a/analysis/decompiled/native/build.gradle.kts b/analysis/decompiled/decompiler-native/build.gradle.kts similarity index 100% rename from analysis/decompiled/native/build.gradle.kts rename to analysis/decompiled/decompiler-native/build.gradle.kts diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/CachingIdeKlibMetadataLoader.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataDecompiler.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/Fe10KlibMetadataStubBuilder.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/FileWithMetadata.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/FileWithMetadata.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/FileWithMetadata.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/FileWithMetadata.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataDecompiler.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataDecompiler.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataDecompiler.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataDecompiler.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KlibMetadataStubBuilder.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/K2KotlinNativeMetadataDecompiler.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibDecompiledFile.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibLoadingMetadataCache.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibLoadingMetadataCache.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibLoadingMetadataCache.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibLoadingMetadataCache.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetaFileType.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDecompiler.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDeserializerForDecompiler.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDeserializerForDecompiler.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDeserializerForDecompiler.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataDeserializerForDecompiler.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KlibMetadataStubBuilder.kt diff --git a/analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt b/analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt similarity index 100% rename from analysis/decompiled/native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt rename to analysis/decompiled/decompiler-native/src/org/jetbrains/kotlin/analysis/decompiler/konan/KotlinNativeMetadataDecompiler.kt diff --git a/analysis/decompiled/native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/AbstractDecompiledKnmStubConsistencyTest.kt b/analysis/decompiled/decompiler-native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/AbstractDecompiledKnmStubConsistencyTest.kt similarity index 100% rename from analysis/decompiled/native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/AbstractDecompiledKnmStubConsistencyTest.kt rename to analysis/decompiled/decompiler-native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/AbstractDecompiledKnmStubConsistencyTest.kt diff --git a/analysis/decompiled/native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyFe10TestGenerated.java b/analysis/decompiled/decompiler-native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyFe10TestGenerated.java similarity index 100% rename from analysis/decompiled/native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyFe10TestGenerated.java rename to analysis/decompiled/decompiler-native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyFe10TestGenerated.java diff --git a/analysis/decompiled/native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyK2TestGenerated.java b/analysis/decompiled/decompiler-native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyK2TestGenerated.java similarity index 100% rename from analysis/decompiled/native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyK2TestGenerated.java rename to analysis/decompiled/decompiler-native/tests/org/jetbrains/kotlin/analysis/decompiler/konan/DecompiledKnmStubConsistencyK2TestGenerated.java diff --git a/build.gradle.kts b/build.gradle.kts index e187c9ec6cd..e64a1253fae 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -152,7 +152,7 @@ val commonCompilerModules = arrayOf( ":compiler:frontend.java", // TODO this is fe10 module but some utils used in fir ide now ":analysis:decompiled:decompiler-to-stubs", ":analysis:decompiled:decompiler-to-file-stubs", - ":analysis:decompiled:native", + ":analysis:decompiled:decompiler-native", ":analysis:decompiled:decompiler-to-psi", ":analysis:decompiled:light-classes-for-decompiled", ":analysis:analysis-api-providers", diff --git a/generators/analysis-api-generator/build.gradle.kts b/generators/analysis-api-generator/build.gradle.kts index e1e92220621..c981f4ad79e 100644 --- a/generators/analysis-api-generator/build.gradle.kts +++ b/generators/analysis-api-generator/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { testImplementation(projectTests(":analysis:decompiled:decompiler-to-file-stubs")) testImplementation(projectTests(":analysis:decompiled:decompiler-to-psi")) testImplementation(projectTests(":analysis:symbol-light-classes")) - testImplementation(projectTests(":analysis:decompiled:native")) + testImplementation(projectTests(":analysis:decompiled:decompiler-native")) testImplementation(intellijCore()) testApi(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter.api) diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/decompiled.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/decompiled.kt index bae81659e5b..bb19f3dda01 100644 --- a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/decompiled.kt +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/decompiled.kt @@ -56,7 +56,7 @@ internal fun TestGroupSuite.generateDecompiledTests() { } testGroup( - "analysis/decompiled/native/tests", + "analysis/decompiled/decompiler-native/tests", "analysis/decompiled/decompiler-to-file-stubs/testData", ) { testClass { diff --git a/settings.gradle b/settings.gradle index 0841147f6c2..9aaf560665a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -571,7 +571,7 @@ include ":generators:analysis-api-generator", ":analysis:decompiled:decompiler-to-psi", ":analysis:decompiled:decompiler-to-stubs", ":analysis:decompiled:decompiler-to-file-stubs", - ":analysis:decompiled:native", + ":analysis:decompiled:decompiler-native", ":analysis:decompiled:light-classes-for-decompiled", ":analysis:decompiled:light-classes-for-decompiled-fe10", ":prepare:analysis-api-test-framework",