From b6a41c6d93b4662328ece2d207986b4fe72464be Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 13 Mar 2023 10:29:45 +0200 Subject: [PATCH] [CLI] Extract classes of compiler configuration from :compiler:cli to the separate module Those classes mainly include KotlinCoreEnvironment and its dependencies This change is needed for two reasons: 1. Splitting of some common configuration of compiler from logic of CLI makes code structure more clean 2. There is a need to add dependency on `:analysis:analysis-api-standalone` to `:compiler:cli`, because FIR analogue of AnalysysHandlerExtension uses services from it. But the problems is that standalone AA itself depends on classes for compiler configuration, which leads to circular dependency between those modules. Extracting configuration to `:compiler:cli-base` solves the problem --- .../build.gradle.kts | 2 +- .../analysis-api-standalone/build.gradle.kts | 1 - build.gradle.kts | 3 +- compiler/cli/build.gradle.kts | 11 +--- compiler/cli/cli-base/build.gradle.kts | 53 +++++++++++++++++++ .../cli/common/CLIConfigurationKeys.java | 0 .../CommonCompilerPerformanceManager.kt | 0 .../kotlin/cli/common/config/ContentRoots.kt | 0 .../common/extensions/ReplFactoryExtension.kt | 0 .../extensions/ScriptEvaluationExtension.kt | 0 .../cli/common/extensions/ShellExtension.kt | 0 .../cli/common/messages/MessageUtil.java | 0 .../kotlin/cli/common/moduleVisibilityImpl.kt | 0 .../cli/common/performanceMeasurements.kt | 0 .../jvm/compiler/ClasspathRootsResolver.kt | 0 .../jvm/compiler/CliKotlinAsJavaSupport.kt | 0 .../CliLightClassGenerationSupport.kt | 2 +- .../compiler/CliModuleAnnotationsResolver.kt | 0 .../kotlin/cli/jvm/compiler/CliTrace.kt | 0 .../cli/jvm/compiler/CliVirtualFileFinder.kt | 0 .../compiler/CliVirtualFileFinderFactory.kt | 0 .../jvm/compiler/EnvironmentConfigFiles.java | 0 .../cli/jvm/compiler/IdeaExtensionPoints.kt | 0 .../cli/jvm/compiler/JavaLanguageLevel.kt | 0 .../jvm/compiler/JvmPackagePartProvider.kt | 0 .../compiler/KotlinCliJavaFileManagerImpl.kt | 0 .../KotlinCoreApplicationEnvironment.kt | 2 +- .../cli/jvm/compiler/KotlinCoreEnvironment.kt | 6 +-- .../compiler/KotlinCoreProjectEnvironment.kt | 0 .../MockExternalAnnotationsManager.kt | 0 .../MockInferredAnnotationsManager.kt | 0 .../compiler/TopDownAnalyzerFacadeForJVM.kt | 0 .../builder/KotlinLightClassBuilderFactory.kt | 0 .../jvm/compiler/builder/LightClassBuilder.kt | 0 .../builder/LightClassConstructionContext.kt | 0 .../compiler/builder/StubClassBuilder.java | 0 .../cli/jvm/compiler/cliJavaModuleUtils.kt | 0 .../kotlin/cli/jvm/compiler/compat.kt | 0 .../cli/jvm/compiler/coreEnvironmentUtils.kt | 0 .../compiler/jarfs/ByteArrayCharSequence.kt | 0 .../jvm/compiler/jarfs/FastJarFileSystem.kt | 0 .../cli/jvm/compiler/jarfs/FastJarHandler.kt | 0 .../jvm/compiler/jarfs/FastJarVirtualFile.kt | 0 .../jvm/compiler/jarfs/ZipImplementation.kt | 0 ...sicFrontendSpecificJvmConfigurationKeys.kt | 0 .../kotlin/cli/jvm/config/JvmContentRoots.kt | 0 .../JvmDependenciesDynamicCompoundIndex.kt | 0 .../cli/jvm/index/JvmDependenciesIndex.kt | 0 .../cli/jvm/index/JvmDependenciesIndexImpl.kt | 0 .../cli/jvm/index/SingleJavaFileRootsIndex.kt | 0 .../kotlin/cli/jvm/javac/JavacLogger.kt | 0 .../javac/JavacWrapperKotlinResolverImpl.kt | 0 .../cli/jvm/javac/JavacWrapperRegistrar.kt | 0 .../cli/jvm/modules/CliJavaModuleFinder.kt | 0 .../cli/jvm/modules/CliJavaModuleResolver.kt | 0 .../cli/jvm/modules/CoreJrtFileSystem.kt | 0 .../cli/jvm/modules/CoreJrtVirtualFile.kt | 0 .../cli/jvm/modules/CtSymClassVirtualFile.kt | 2 +- .../jvm/modules/CtSymDirectoryContainer.kt | 4 +- .../kotlin/cli/jvm/modules/JavaModuleGraph.kt | 0 .../cli/jvm/modules/javaVersionUtils.kt | 0 .../kotlin/resolve/CompilerEnvironment.kt | 0 kotlin-native/backend.native/build.gradle | 1 + .../backend.native/tests/build.gradle | 1 + settings.gradle | 4 +- 65 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 compiler/cli/cli-base/build.gradle.kts rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/CommonCompilerPerformanceManager.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/config/ContentRoots.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/extensions/ReplFactoryExtension.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/extensions/ScriptEvaluationExtension.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/extensions/ShellExtension.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/common/performanceMeasurements.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/CliKotlinAsJavaSupport.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt (98%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/CliModuleAnnotationsResolver.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/CliTrace.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/EnvironmentConfigFiles.java (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.kt (99%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt (99%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreProjectEnvironment.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/MockInferredAnnotationsManager.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/KotlinLightClassBuilderFactory.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassBuilder.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassConstructionContext.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/StubClassBuilder.java (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/cliJavaModuleUtils.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/coreEnvironmentUtils.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarFileSystem.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarHandler.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarVirtualFile.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ZipImplementation.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/config/ClassicFrontendSpecificJvmConfigurationKeys.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesDynamicCompoundIndex.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndex.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/index/SingleJavaFileRootsIndex.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/javac/JavacLogger.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperKotlinResolverImpl.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperRegistrar.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtVirtualFile.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymClassVirtualFile.kt (99%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt (97%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleGraph.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt (100%) rename compiler/cli/{ => cli-base}/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt (100%) diff --git a/analysis/analysis-api-standalone/analysis-api-standalone-base/build.gradle.kts b/analysis/analysis-api-standalone/analysis-api-standalone-base/build.gradle.kts index 0b32e7765c5..b7e826a0c5e 100644 --- a/analysis/analysis-api-standalone/analysis-api-standalone-base/build.gradle.kts +++ b/analysis/analysis-api-standalone/analysis-api-standalone-base/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(intellijCore()) implementation(kotlinStdlib()) implementation(project(":compiler:psi")) - implementation(project(":compiler:cli")) + api(project(":compiler:cli-base")) api(project(":analysis:analysis-api")) api(project(":analysis:analysis-api-providers")) api(project(":analysis:project-structure")) diff --git a/analysis/analysis-api-standalone/build.gradle.kts b/analysis/analysis-api-standalone/build.gradle.kts index 45bf43a1f37..6b4cb6bd47e 100644 --- a/analysis/analysis-api-standalone/build.gradle.kts +++ b/analysis/analysis-api-standalone/build.gradle.kts @@ -10,7 +10,6 @@ kotlin { dependencies { implementation(intellijCore()) implementation(project(":compiler:psi")) - implementation(project(":compiler:cli")) api(project(":analysis:analysis-api")) api(project(":analysis:analysis-api-providers")) api(project(":analysis:project-structure")) diff --git a/build.gradle.kts b/build.gradle.kts index dd7c2790b25..206aba13619 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -183,7 +183,6 @@ val fe10CompilerModules = arrayOf( ":compiler:serialization", ":compiler:frontend", ":compiler:container", - ":compiler:cli-common", ":core:deserialization", ":compiler:frontend:cfg", ":compiler:ir.psi2ir", @@ -200,6 +199,8 @@ val fe10CompilerModules = arrayOf( ":compiler:backend", ":compiler:plugin-api", ":compiler:javac-wrapper", + ":compiler:cli-common", + ":compiler:cli-base", ":compiler:cli", ":compiler:cli-js", ":compiler:incremental-compilation-impl", diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index adc8f9d5fff..8bc3a3dbda7 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -5,22 +5,14 @@ plugins { dependencies { api(project(":compiler:util")) - api(project(":compiler:cli-common")) + api(project(":compiler:cli-base")) api(project(":compiler:frontend")) - api(project(":compiler:frontend.java")) - api(project(":compiler:frontend:cfg")) api(project(":compiler:backend-common")) api(project(":compiler:backend")) - api(project(":compiler:backend.jvm")) implementation(project(":compiler:backend.jvm.entrypoint")) - api(project(":compiler:ir.backend.common")) - api(project(":compiler:light-classes")) api(project(":compiler:serialization")) api(project(":compiler:plugin-api")) - api(project(":compiler:javac-wrapper")) api(project(":js:js.translator")) - api(project(":native:frontend.native")) - api(project(":wasm:wasm.frontend")) api(commonDependency("org.fusesource.jansi", "jansi")) api(project(":compiler:fir:raw-fir:psi2fir")) api(project(":compiler:fir:resolve")) @@ -35,7 +27,6 @@ dependencies { api(project(":compiler:fir:checkers:checkers.js")) api(project(":compiler:fir:checkers:checkers.native")) api(project(":compiler:fir:fir-serialization")) - api(project(":kotlin-util-klib")) api(project(":kotlin-util-io")) compileOnly(toolsJarApi()) diff --git a/compiler/cli/cli-base/build.gradle.kts b/compiler/cli/cli-base/build.gradle.kts new file mode 100644 index 00000000000..cf57d837f53 --- /dev/null +++ b/compiler/cli/cli-base/build.gradle.kts @@ -0,0 +1,53 @@ +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + api(project(":compiler:cli-common")) + api(project(":compiler:resolution.common")) + api(project(":compiler:frontend.java")) + api(project(":compiler:frontend:cfg")) + api(project(":compiler:ir.backend.common")) + api(project(":compiler:backend.jvm")) + api(project(":compiler:light-classes")) + api(project(":compiler:javac-wrapper")) + api(project(":compiler:ir.serialization.jvm")) + api(project(":js:js.translator")) + api(project(":native:frontend.native")) + api(project(":wasm:wasm.frontend")) + api(project(":kotlin-util-klib")) + api(project(":kotlin-util-klib-metadata")) + + compileOnly(toolsJarApi()) + compileOnly(intellijCore()) + compileOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) + compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all")) +} + +sourceSets { + "main" { + projectDefault() + } + "test" { none() } +} + +allprojects { + optInToExperimentalCompilerApi() +} + +tasks.withType> { + kotlinOptions { + languageVersion = "1.4" + apiVersion = "1.4" + freeCompilerArgs = freeCompilerArgs - "-progressive" + listOf( + "-Xskip-prerelease-check", "-Xsuppress-version-warnings", "-Xuse-mixed-named-arguments" + ) + } +} + +testsJar {} + +projectTest { + workingDir = rootDir +} diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CommonCompilerPerformanceManager.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/CommonCompilerPerformanceManager.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/CommonCompilerPerformanceManager.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/CommonCompilerPerformanceManager.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/config/ContentRoots.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/config/ContentRoots.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/config/ContentRoots.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/config/ContentRoots.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/extensions/ReplFactoryExtension.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/extensions/ReplFactoryExtension.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/extensions/ReplFactoryExtension.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/extensions/ReplFactoryExtension.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/extensions/ScriptEvaluationExtension.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/extensions/ScriptEvaluationExtension.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/extensions/ScriptEvaluationExtension.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/extensions/ScriptEvaluationExtension.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/extensions/ShellExtension.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/extensions/ShellExtension.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/extensions/ShellExtension.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/extensions/ShellExtension.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/moduleVisibilityImpl.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/performanceMeasurements.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/performanceMeasurements.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/common/performanceMeasurements.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/common/performanceMeasurements.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/ClasspathRootsResolver.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliKotlinAsJavaSupport.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliKotlinAsJavaSupport.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliKotlinAsJavaSupport.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliKotlinAsJavaSupport.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt similarity index 98% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt index 15d896de5b0..1e5400814c1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt @@ -89,7 +89,7 @@ class CliLightClassGenerationSupport( return ultraLightSupport } - internal val context: LightClassConstructionContext + val context: LightClassConstructionContext get() = LightClassConstructionContext( traceHolder.bindingContext, traceHolder.module, diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliModuleAnnotationsResolver.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliModuleAnnotationsResolver.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliModuleAnnotationsResolver.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliModuleAnnotationsResolver.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliTrace.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliTrace.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliTrace.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliTrace.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/EnvironmentConfigFiles.java b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/EnvironmentConfigFiles.java similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/EnvironmentConfigFiles.java rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/EnvironmentConfigFiles.java diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/JavaLanguageLevel.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCliJavaFileManagerImpl.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.kt similarity index 99% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.kt index 1de3b9b5a0b..6aa0cb03ba5 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.kt @@ -81,4 +81,4 @@ class KotlinCoreApplicationEnvironment private constructor( registerVersionSpecificAppExtensionPoints(ApplicationManager.getApplication().extensionArea) } } -} \ No newline at end of file +} diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt similarity index 99% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 43aebfceb4c..83eab9d8c8f 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -117,7 +117,7 @@ class KotlinCoreEnvironment private constructor( ) : KotlinCoreProjectEnvironment(disposable, applicationEnvironment) { - internal val jarFileSystem: VirtualFileSystem + val jarFileSystem: VirtualFileSystem init { val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY) @@ -339,7 +339,7 @@ class KotlinCoreEnvironment private constructor( val project: Project get() = projectEnvironment.project - internal fun countLinesOfCode(sourceFiles: List): Int = + fun countLinesOfCode(sourceFiles: List): Int = sourceFiles.sumBy { sourceFile -> val text = sourceFile.text StringUtil.getLineBreakCount(text) + (if (StringUtil.endsWithLineBreak(text)) 0 else 1) @@ -384,7 +384,7 @@ class KotlinCoreEnvironment private constructor( throw IllegalStateException("Unexpected root: $root") } - internal fun findLocalFile(path: String): VirtualFile? = + fun findLocalFile(path: String): VirtualFile? = applicationEnvironment.localFileSystem.findFileByPath(path) private fun findExistingRoot(root: JvmContentRoot, rootDescription: String): VirtualFile? { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreProjectEnvironment.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreProjectEnvironment.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreProjectEnvironment.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreProjectEnvironment.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/MockInferredAnnotationsManager.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/MockInferredAnnotationsManager.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/MockInferredAnnotationsManager.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/MockInferredAnnotationsManager.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/KotlinLightClassBuilderFactory.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/KotlinLightClassBuilderFactory.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/KotlinLightClassBuilderFactory.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/KotlinLightClassBuilderFactory.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassBuilder.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassBuilder.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassBuilder.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassBuilder.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassConstructionContext.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassConstructionContext.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassConstructionContext.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/LightClassConstructionContext.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/StubClassBuilder.java b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/StubClassBuilder.java similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/StubClassBuilder.java rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/builder/StubClassBuilder.java diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/cliJavaModuleUtils.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/cliJavaModuleUtils.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/cliJavaModuleUtils.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/cliJavaModuleUtils.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/compat.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreEnvironmentUtils.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/coreEnvironmentUtils.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/coreEnvironmentUtils.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/coreEnvironmentUtils.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ByteArrayCharSequence.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarFileSystem.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarFileSystem.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarFileSystem.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarFileSystem.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarHandler.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarHandler.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarHandler.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarHandler.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarVirtualFile.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarVirtualFile.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarVirtualFile.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/FastJarVirtualFile.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ZipImplementation.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ZipImplementation.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ZipImplementation.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/jarfs/ZipImplementation.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/ClassicFrontendSpecificJvmConfigurationKeys.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/config/ClassicFrontendSpecificJvmConfigurationKeys.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/ClassicFrontendSpecificJvmConfigurationKeys.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/config/ClassicFrontendSpecificJvmConfigurationKeys.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/config/JvmContentRoots.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesDynamicCompoundIndex.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesDynamicCompoundIndex.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesDynamicCompoundIndex.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesDynamicCompoundIndex.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndex.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndex.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndex.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndex.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/JvmDependenciesIndexImpl.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/index/SingleJavaFileRootsIndex.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/SingleJavaFileRootsIndex.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/index/SingleJavaFileRootsIndex.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/index/SingleJavaFileRootsIndex.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacLogger.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/javac/JavacLogger.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacLogger.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/javac/JavacLogger.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperKotlinResolverImpl.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperKotlinResolverImpl.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperKotlinResolverImpl.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperKotlinResolverImpl.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperRegistrar.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperRegistrar.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperRegistrar.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/javac/JavacWrapperRegistrar.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleFinder.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtFileSystem.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtVirtualFile.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtVirtualFile.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtVirtualFile.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CoreJrtVirtualFile.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymClassVirtualFile.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymClassVirtualFile.kt similarity index 99% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymClassVirtualFile.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymClassVirtualFile.kt index 73d1cf018e9..fd23b51defa 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymClassVirtualFile.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymClassVirtualFile.kt @@ -46,4 +46,4 @@ class CtSymClassVirtualFile( override fun getFileType(): FileType = JavaClassFileType.INSTANCE override fun getModificationStamp(): Long = file.modificationStamp -} \ No newline at end of file +} diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt similarity index 97% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt index 537f3ec5971..6509ce6ed29 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CtSymDirectoryContainer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -82,4 +82,4 @@ class CtSymDirectoryContainer( override fun refresh(p0: Boolean, p1: Boolean, p2: Runnable?) {} override fun getInputStream(): InputStream? = error("not supported") -} \ No newline at end of file +} diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleGraph.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleGraph.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleGraph.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleGraph.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/javaVersionUtils.kt diff --git a/compiler/cli/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt similarity index 100% rename from compiler/cli/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt rename to compiler/cli/cli-base/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle index f69cd67d5ef..12cc0b67141 100644 --- a/kotlin-native/backend.native/build.gradle +++ b/kotlin-native/backend.native/build.gradle @@ -148,6 +148,7 @@ dependencies { compilerApi project(":compiler:util") compilerApi project(":native:frontend.native") compilerApi project(":compiler:cli-common") + compilerApi project(":compiler:cli-base") compilerApi project(":compiler:cli") compilerApi project(":kotlin-util-klib") compilerApi project(":kotlin-util-klib-metadata") diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index c267c009913..511d7d76e49 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -6614,6 +6614,7 @@ dependencies { nopPluginApi project(":compiler:util") nopPluginApi project(":native:frontend.native") nopPluginApi project(":compiler:cli-common") + nopPluginApi project(":compiler:cli-base") nopPluginApi project(":compiler:cli") nopPluginApi project(":kotlin-util-klib") nopPluginApi project(":kotlin-util-klib-metadata") diff --git a/settings.gradle b/settings.gradle index 94a07770759..e8564a1a3c1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -56,7 +56,6 @@ include ":benchmarks", ":compiler:frontend:cfg", ":kotlin-compiler-runner-unshaded", ":kotlin-compiler-runner", - ":compiler:cli-common", ":compiler:ir.tree", ":compiler:ir.tree:tree-generator", ":compiler:ir.psi2ir", @@ -77,6 +76,8 @@ include ":benchmarks", ":compiler:plugin-api", ":compiler:light-classes", ":compiler:javac-wrapper", + ":compiler:cli-common", + ":compiler:cli-base", ":compiler:cli", ":compiler:cli-js", ":compiler:incremental-compilation-impl", @@ -623,6 +624,7 @@ project(':kotlin-compiler-client-embeddable').projectDir = "$rootDir/prepare/com project(':kotlin-preloader').projectDir = "$rootDir/compiler/preloader" as File project(':kotlin-build-common').projectDir = "$rootDir/build-common" as File project(':compiler:cli-common').projectDir = "$rootDir/compiler/cli/cli-common" as File +project(':compiler:cli-base').projectDir = "$rootDir/compiler/cli/cli-base" as File project(':compiler:cli-js').projectDir = "$rootDir/compiler/cli/cli-js" as File project(':kotlin-runner').projectDir = "$rootDir/compiler/cli/cli-runner" as File project(':kotlin-daemon').projectDir = "$rootDir/compiler/daemon" as File