diff --git a/README.md b/README.md index 21b818862d02..b3c2470365c1 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ To build IntelliJ IDEA Community Edition from source, choose **Build | Build Pro To build installation packages, run the `installers.cmd` command in `` directory. `installers.cmd` will work on both Windows and Unix systems. Options to build installers are passed as system properties to `installers.cmd` command. -You may find the list of available properties in [BuildOptions.groovy](platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.groovy) +You may find the list of available properties in [BuildOptions.kt](platform/build-scripts/src/org/jetbrains/intellij/build/BuildOptions.kt) Examples (`./` should be added only for Linux/macOS): * Build installers only for current operating system: `./installers.cmd -Dintellij.build.target.os=current` @@ -83,7 +83,7 @@ The "Contribute Code" section of that site describes how you can contribute to I To run tests outside of IntelliJ IDEA, run the `tests.cmd` command in `` directory. `tests.cmd` will work on both Windows and Unix systems. Options to run tests are passed as system properties to `tests.cmd` command. -You may find the list of available properties in [TestingOptions.groovy](platform/build-scripts/groovy/org/jetbrains/intellij/build/TestingOptions.groovy) +You may find the list of available properties in [TestingOptions.kt](platform/build-scripts/src/org/jetbrains/intellij/build/TestingOptions.kt) Examples (`./` should be added only for Linux/macOS): * Build source code _incrementally_ (do not build what was already built before): `./tests.cmd -Dintellij.build.incremental.compilation=true` diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml index c2270d1b1665..bbe19c1582a1 100644 --- a/platform/build-scripts/intellij.platform.buildScripts.iml +++ b/platform/build-scripts/intellij.platform.buildScripts.iml @@ -25,7 +25,7 @@ - + diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ApplicationInfoProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/ApplicationInfoProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/ApplicationInfoProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ApplicationInfoPropertiesImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ApplicationInfoPropertiesImpl.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/ApplicationInfoPropertiesImpl.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/ApplicationInfoPropertiesImpl.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ArtifactsServer.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ArtifactsServer.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/ArtifactsServer.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/ArtifactsServer.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildContext.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildContext.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildContext.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/BuildContext.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildMessageLogger.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildMessageLogger.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildMessageLogger.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/BuildMessageLogger.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildMessages.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildMessages.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildMessages.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/BuildMessages.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildOptions.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildOptions.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/BuildOptions.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildPaths.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildPaths.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildPaths.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/BuildPaths.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildTasks.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/BuildTasks.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CompatibleBuildRange.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CompatibleBuildRange.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/CompatibleBuildRange.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/CompatibleBuildRange.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CompilationContext.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CompilationContext.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/CompilationContext.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/CompilationContext.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/FileAssociation.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/FileAssociation.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/FileAssociation.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/FileAssociation.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/FileSet.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/FileSet.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/FileSet.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/FileSet.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/GradleRunner.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/GradleRunner.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/GradleRunner.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/GradleRunner.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/IdeaProjectLoaderUtil.java b/platform/build-scripts/src/org/jetbrains/intellij/build/IdeaProjectLoaderUtil.java similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/IdeaProjectLoaderUtil.java rename to platform/build-scripts/src/org/jetbrains/intellij/build/IdeaProjectLoaderUtil.java diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/JavaPluginLayout.groovy diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JetBrainsProductProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JetBrainsProductProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/JetBrainsProductProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/JetBrainsProductProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JetBrainsRuntimeDistribution.java b/platform/build-scripts/src/org/jetbrains/intellij/build/JetBrainsRuntimeDistribution.java similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/JetBrainsRuntimeDistribution.java rename to platform/build-scripts/src/org/jetbrains/intellij/build/JetBrainsRuntimeDistribution.java diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JvmArchitecture.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/JvmArchitecture.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/JvmArchitecture.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/JvmArchitecture.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/LibraryLicense.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/LibraryLicense.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/LibraryLicense.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/LibraryLicense.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/LibraryLicenseBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/LibraryLicenseBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/LibraryLicenseBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/LibraryLicenseBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/MacDistributionCustomizer.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/MacDistributionCustomizer.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/MacDistributionCustomizer.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/MacDistributionCustomizer.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/MacHostProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/MacHostProperties.kt similarity index 96% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/MacHostProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/MacHostProperties.kt index d6fca7f2ffb2..3d3b467a99e6 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/MacHostProperties.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/MacHostProperties.kt @@ -1,9 +1,6 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.intellij.build -import groovy.transform.CompileStatic -import groovy.transform.Immutable - /** * The purpose of using Mac host is preparation and signing OS X specific artifacts.
* The necessary software for Mac host: diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/MavenArtifactsProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/MavenArtifactsProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/MavenArtifactsProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/MavenArtifactsProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/OsFamily.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/OsFamily.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/OsFamily.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/OsFamily.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/PluginBundlingRestrictions.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/PluginBundlingRestrictions.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/PluginBundlingRestrictions.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/PluginBundlingRestrictions.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductModulesLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ProductModulesLayout.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductModulesLayout.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/ProductModulesLayout.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ProductProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/ProductProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProprietaryBuildTools.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ProprietaryBuildTools.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/ProprietaryBuildTools.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/ProprietaryBuildTools.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ScrambleTool.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/ScrambleTool.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/ScrambleTool.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/ScrambleTool.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/SignTool.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/SignTool.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/SignTool.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/SignTool.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/TestingOptions.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/TestingOptions.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/TestingOptions.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/TestingOptions.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/TestingTasks.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/TestingTasks.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/TestingTasks.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/TestingTasks.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/WindowsDistributionCustomizer.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/WindowsDistributionCustomizer.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/WindowsDistributionCustomizer.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/WindowsDistributionCustomizer.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/causal/CausalProfilingOptions.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/causal/CausalProfilingOptions.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/causal/CausalProfilingOptions.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/causal/CausalProfilingOptions.groovy diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/causal/ProgressPoint.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/causal/ProgressPoint.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/causal/ProgressPoint.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/causal/ProgressPoint.groovy diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/fus/FeatureUsageStatisticsProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/fus/FeatureUsageStatisticsProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/fus/FeatureUsageStatisticsProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/fus/FeatureUsageStatisticsProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/fus/StatisticsRecorderBundledMetadataProvider.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/fus/StatisticsRecorderBundledMetadataProvider.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/fus/StatisticsRecorderBundledMetadataProvider.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/fus/StatisticsRecorderBundledMetadataProvider.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/http.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/http.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/http.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/http.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ArchiveUtils.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/ArchiveUtils.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ArchiveUtils.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/ArchiveUtils.groovy diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BaseLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BaseLayout.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BaseLayout.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BaseLayout.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BaseLayoutSpec.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BaseLayoutSpec.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BaseLayoutSpec.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildContextImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildContextImpl.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildDependenciesOpenTelemetryTracer.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildDependenciesOpenTelemetryTracer.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildDependenciesOpenTelemetryTracer.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildDependenciesOpenTelemetryTracer.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildHelper.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildHelper.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildHelper.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildHelper.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildUtils.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildUtils.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildUtils.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildUtils.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuiltinModulesFileUtils.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltinModulesFileUtils.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuiltinModulesFileUtils.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltinModulesFileUtils.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledRuntime.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BundledRuntime.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledRuntime.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BundledRuntime.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledRuntimeImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BundledRuntimeImpl.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledRuntimeImpl.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/BundledRuntimeImpl.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ClassFileChecker.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/ClassFileChecker.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ClassFileChecker.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/ClassFileChecker.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompilationContextImpl.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationContextImpl.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompilationContextImpl.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationTasksImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompilationTasksImpl.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationTasksImpl.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompilationTasksImpl.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompoundRunConfigurationProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompoundRunConfigurationProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompoundRunConfigurationProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/CompoundRunConfigurationProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionBuilderState.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionBuilderState.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionBuilderState.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionBuilderState.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/IntellijModulesPublication.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/IntellijModulesPublication.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/IntellijModulesPublication.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/IntellijModulesPublication.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JUnitRunConfigurationProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JUnitRunConfigurationProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JUnitRunConfigurationProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/JUnitRunConfigurationProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JarPackager.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JarPackager.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JdkUtils.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JdkUtils.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/JdkUtils.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JpsCompilationData.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationData.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JpsCompilationData.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationData.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt similarity index 99% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt index 610b40158997..04499d45cc4c 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt @@ -8,7 +8,6 @@ import com.intellij.diagnostic.telemetry.useWithScope import com.intellij.openapi.diagnostic.DefaultLogger import com.intellij.openapi.diagnostic.Logger import com.intellij.util.containers.MultiMap -import groovy.transform.CompileStatic import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import org.jetbrains.annotations.Nls @@ -42,7 +41,6 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.TimeUnit import java.util.function.BiConsumer -@CompileStatic internal class JpsCompilationRunner(private val context: CompilationContext) { private val compilationData = context.compilationData diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/KotlinMavenArtifactsBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/KotlinMavenArtifactsBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/KotlinMavenArtifactsBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/KotlinMavenArtifactsBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/KotlinRunConfigurationProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/KotlinRunConfigurationProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/KotlinRunConfigurationProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/KotlinRunConfigurationProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LibraryLicensesListGenerator.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/LibraryLicensesListGenerator.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LibraryLicensesListGenerator.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/LibraryLicensesListGenerator.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/MacDistributionBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDistributionBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/MacDistributionBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/MacDmgBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/MacDmgBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/MavenArtifactsBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ModuleOutputPatcher.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/ModuleOutputPatcher.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ModuleOutputPatcher.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/ModuleOutputPatcher.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ModuleResourceData.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/ModuleResourceData.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ModuleResourceData.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/ModuleResourceData.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ModuleStructureValidator.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/ModuleStructureValidator.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ModuleStructureValidator.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/ModuleStructureValidator.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/NsisFileListGenerator.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/NsisFileListGenerator.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/NsisFileListGenerator.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/NsisFileListGenerator.groovy diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/OsSpecificDistributionBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/OsSpecificDistributionBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/OsSpecificDistributionBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/OsSpecificDistributionBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformLayout.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformLayout.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformLayout.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformModules.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginLayout.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginLayout.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginLayout.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginLayout.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginLayoutGroovy.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginLayoutGroovy.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginLayoutGroovy.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginLayoutGroovy.groovy diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginRepositoryXmlGenerator.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginRepositoryXmlGenerator.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginRepositoryXmlGenerator.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginRepositoryXmlGenerator.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginXmlPatcher.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginXmlPatcher.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginXmlPatcher.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginXmlPatcher.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginsCollector.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginsCollector.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PluginsCollector.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/PluginsCollector.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ProjectLibraryData.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/ProjectLibraryData.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ProjectLibraryData.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/ProjectLibraryData.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/RunConfigurationProperties.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/RunConfigurationProperties.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/RunConfigurationProperties.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/RunConfigurationProperties.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/SVGPreBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/SVGPreBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/SVGPreBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/SVGPreBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ToolboxLiteGen.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/ToolboxLiteGen.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/ToolboxLiteGen.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/ToolboxLiteGen.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/TraceFileUploader.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/TraceFileUploader.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/TraceFileUploader.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/TraceFileUploader.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/VmOptionsGenerator.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/VmOptionsGenerator.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/VmOptionsGenerator.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/VmOptionsGenerator.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/WindowsDistributionBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/addToClasspathAgent/AddToClasspathJavaAgent.java b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/addToClasspathAgent/AddToClasspathJavaAgent.java similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/addToClasspathAgent/AddToClasspathJavaAgent.java rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/addToClasspathAgent/AddToClasspathJavaAgent.java diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/addToClasspathAgent/AddToClasspathUtil.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/addToClasspathAgent/AddToClasspathUtil.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/addToClasspathAgent/AddToClasspathUtil.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/addToClasspathAgent/AddToClasspathUtil.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/CompilationPartsUtil.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompilationPartsUtil.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/CompilationPartsUtil.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompilationPartsUtil.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/CompiledClasses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompiledClasses.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/CompiledClasses.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompiledClasses.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/DirectFixedSizeByteBufferPool.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/DirectFixedSizeByteBufferPool.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/DirectFixedSizeByteBufferPool.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/DirectFixedSizeByteBufferPool.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/Git.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/Git.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/Git.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/Git.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCache.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCache.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCache.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCache.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCacheDownloader.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCacheDownloader.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCacheDownloader.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCacheDownloader.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCacheUploader.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCacheUploader.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCacheUploader.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/PortableCompilationCacheUploader.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/cache/CommitsHistory.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/cache/CommitsHistory.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/cache/CommitsHistory.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/cache/CommitsHistory.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/cache/SourcesStateProcessor.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/cache/SourcesStateProcessor.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/cache/SourcesStateProcessor.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/cache/SourcesStateProcessor.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/download.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/download.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/download.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/download.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/upload.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/upload.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/compilation/upload.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/upload.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/distUtil.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/distUtil.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/distUtil.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/distUtil.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/keymapPlugin.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/keymapPlugin.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/keymapPlugin.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/keymapPlugin.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/BuildMessageLoggerBase.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/BuildMessageLoggerBase.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/BuildMessageLoggerBase.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/BuildMessageLoggerBase.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/BuildMessagesHandler.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/BuildMessagesHandler.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/BuildMessagesHandler.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/BuildMessagesHandler.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/BuildMessagesImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/BuildMessagesImpl.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/BuildMessagesImpl.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/BuildMessagesImpl.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/IntelliJBuildException.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/IntelliJBuildException.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/IntelliJBuildException.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/IntelliJBuildException.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/TeamCityBuildMessageLogger.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/TeamCityBuildMessageLogger.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/logging/TeamCityBuildMessageLogger.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/TeamCityBuildMessageLogger.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/productInfo/ProductInfoGenerator.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/productInfo/ProductInfoGenerator.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/productInfo/ProductInfoGenerator.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/productInfo/ProductInfoGenerator.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/productInfo/ProductInfoValidator.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/productInfo/ProductInfoValidator.kt similarity index 98% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/productInfo/ProductInfoValidator.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/productInfo/ProductInfoValidator.kt index 59cff2374430..cdfd829de51c 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/productInfo/ProductInfoValidator.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/productInfo/ProductInfoValidator.kt @@ -43,7 +43,7 @@ internal fun validateProductJson(jsonText: String, installationArchives: List>, context: CompilationContext) { val schemaPath = context.paths.communityHomeDir.communityRoot - .resolve("platform/build-scripts/groovy/org/jetbrains/intellij/build/product-info.schema.json") + .resolve("platform/build-scripts/src/org/jetbrains/intellij/build/product-info.schema.json") val messages = context.messages verifyJsonBySchema(jsonText, schemaPath, messages) val productJson = jsonEncoder.decodeFromString(jsonText) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/projectStructureMapping/DistributionFileEntry.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/projectStructureMapping/DistributionFileEntry.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/projectStructureMapping/DistributionFileEntry.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/projectStructureMapping/DistributionFileEntry.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/projectStructureMapping/ProjectStructureMapping.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/projectStructureMapping/ProjectStructureMapping.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/projectStructureMapping/ProjectStructureMapping.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/projectStructureMapping/ProjectStructureMapping.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/support/RepairUtilityBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/support/RepairUtilityBuilder.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/support/RepairUtilityBuilder.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/impl/support/RepairUtilityBuilder.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinBinaries.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinBinaries.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinBinaries.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinBinaries.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt rename to platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinCompilerDependencyDownloader.kt diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/kotlin/KotlinPluginBuilder.groovy diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/package.html b/platform/build-scripts/src/org/jetbrains/intellij/build/package.html similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/package.html rename to platform/build-scripts/src/org/jetbrains/intellij/build/package.html diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/product-info.schema.json b/platform/build-scripts/src/org/jetbrains/intellij/build/product-info.schema.json similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/product-info.schema.json rename to platform/build-scripts/src/org/jetbrains/intellij/build/product-info.schema.json diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy b/platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy similarity index 100% rename from platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy rename to platform/build-scripts/src/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy diff --git a/platform/jps-bootstrap/src/main/java/org/jetbrains/jpsBootstrap/ClassesFromCompileInc.java b/platform/jps-bootstrap/src/main/java/org/jetbrains/jpsBootstrap/ClassesFromCompileInc.java index 285a79f50687..fb0bebf56135 100644 --- a/platform/jps-bootstrap/src/main/java/org/jetbrains/jpsBootstrap/ClassesFromCompileInc.java +++ b/platform/jps-bootstrap/src/main/java/org/jetbrains/jpsBootstrap/ClassesFromCompileInc.java @@ -5,7 +5,6 @@ import com.google.common.base.StandardSystemProperty; import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; import com.intellij.openapi.util.Pair; -import groovy.transform.CompileStatic; import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot; import org.jetbrains.intellij.build.dependencies.BuildDependenciesDownloader; import org.jetbrains.jps.model.JpsProject; @@ -93,7 +92,6 @@ public final class ClassesFromCompileInc { .stream().collect(Collectors.toUnmodifiableMap(pair -> pair.getFirst(), pair -> pair.getSecond())); } - @CompileStatic private static final class CompilationPartsMetadata { @SerializedName("server-url") public String serverUrl;