mirror of
https://github.com/enso-org/enso.git
synced 2024-10-04 00:33:36 +03:00
Cleanup list of Enso's project aggregates (#11170)
* Cleanup list of Enso's project aggregates `sbt> clean` didn't really clean everything as `engine-common` was missing in the list of aggregates. This could turn out problematic for incremental compilation. Apart from adding `engine-common` to the list of aggregates, re-organized the list alphabetically so that it is easier to figure out what is missing there. * engine-common wasn't being formatted
This commit is contained in:
parent
d4ecac5b68
commit
c82e075b2a
103
build.sbt
103
build.sbt
@ -292,84 +292,85 @@ lazy val buildNativeImage =
|
||||
lazy val enso = (project in file("."))
|
||||
.settings(version := "0.1")
|
||||
.aggregate(
|
||||
`persistance-dsl`,
|
||||
`persistance`,
|
||||
`akka-native`,
|
||||
`benchmark-java-helpers`,
|
||||
`benchmarks-common`,
|
||||
`bench-processor`,
|
||||
cli,
|
||||
`common-polyglot-core-utils`,
|
||||
`connected-lock-manager`,
|
||||
`connected-lock-manager-server`,
|
||||
`desktop-environment`,
|
||||
`distribution-manager`,
|
||||
downloader,
|
||||
editions,
|
||||
`edition-updater`,
|
||||
`edition-uploader`,
|
||||
`engine-common`,
|
||||
`engine-runner-common`,
|
||||
`engine-runner`,
|
||||
`enso-test-java-helpers`,
|
||||
`exploratory-benchmark-java-helpers`,
|
||||
filewatcher,
|
||||
`http-test-helper`,
|
||||
`interpreter-dsl`,
|
||||
`interpreter-dsl-test`,
|
||||
`json-rpc-server-test`,
|
||||
`json-rpc-server`,
|
||||
`language-server`,
|
||||
`polyglot-api`,
|
||||
`polyglot-api-macros`,
|
||||
`project-manager`,
|
||||
`syntax-rust-definition`,
|
||||
`text-buffer`,
|
||||
yaml,
|
||||
`scala-yaml`,
|
||||
pkg,
|
||||
cli,
|
||||
`task-progress-notifications`,
|
||||
`profiling-utils`,
|
||||
`logging-utils`,
|
||||
launcher,
|
||||
`library-manager`,
|
||||
`library-manager-test`,
|
||||
`locking-test-helper`,
|
||||
`logging-config`,
|
||||
`logging-service`,
|
||||
`logging-service-logback`,
|
||||
`logging-utils-akka`,
|
||||
filewatcher,
|
||||
`logging-truffle-connector`,
|
||||
`locking-test-helper`,
|
||||
`akka-native`,
|
||||
`version-output`,
|
||||
`logging-utils`,
|
||||
`logging-utils-akka`,
|
||||
`persistance`,
|
||||
`persistance-dsl`,
|
||||
pkg,
|
||||
`polyglot-api`,
|
||||
`polyglot-api-macros`,
|
||||
`process-utils`,
|
||||
`profiling-utils`,
|
||||
`project-manager`,
|
||||
`refactoring-utils`,
|
||||
`engine-runner-common`,
|
||||
`engine-runner`,
|
||||
runtime,
|
||||
searcher,
|
||||
launcher,
|
||||
downloader,
|
||||
`runtime-integration-tests`,
|
||||
`runtime-benchmarks`,
|
||||
`runtime-parser`,
|
||||
`runtime-compiler`,
|
||||
`runtime-suggestions`,
|
||||
`runtime-language-epb`,
|
||||
`runtime-integration-tests`,
|
||||
`runtime-parser`,
|
||||
`runtime-language-arrow`,
|
||||
`runtime-language-epb`,
|
||||
`runtime-instrument-common`,
|
||||
`runtime-instrument-id-execution`,
|
||||
`runtime-instrument-repl-debugger`,
|
||||
`runtime-instrument-runtime-server`,
|
||||
`runtime-suggestions`,
|
||||
`runtime-version-manager`,
|
||||
`runtime-version-manager-test`,
|
||||
editions,
|
||||
`scala-yaml`,
|
||||
searcher,
|
||||
semver,
|
||||
`distribution-manager`,
|
||||
`edition-updater`,
|
||||
`edition-uploader`,
|
||||
`library-manager`,
|
||||
`library-manager-test`,
|
||||
`connected-lock-manager`,
|
||||
`connected-lock-manager-server`,
|
||||
`process-utils`,
|
||||
testkit,
|
||||
`test-utils`,
|
||||
`common-polyglot-core-utils`,
|
||||
`std-aws`,
|
||||
`std-base`,
|
||||
`std-database`,
|
||||
`std-google-api`,
|
||||
`std-image`,
|
||||
`std-table`,
|
||||
`std-aws`,
|
||||
`std-snowflake`,
|
||||
`std-microsoft`,
|
||||
`std-snowflake`,
|
||||
`std-table`,
|
||||
`std-tableau`,
|
||||
`http-test-helper`,
|
||||
`enso-test-java-helpers`,
|
||||
`exploratory-benchmark-java-helpers`,
|
||||
`benchmark-java-helpers`,
|
||||
`benchmarks-common`,
|
||||
`bench-processor`,
|
||||
`ydoc-server`,
|
||||
`desktop-environment`
|
||||
`syntax-rust-definition`,
|
||||
`task-progress-notifications`,
|
||||
testkit,
|
||||
`test-utils`,
|
||||
`text-buffer`,
|
||||
`version-output`,
|
||||
yaml,
|
||||
`ydoc-server`
|
||||
)
|
||||
.settings(Global / concurrentRestrictions += Tags.exclusive(Exclusive))
|
||||
.settings(
|
||||
|
@ -1,8 +1,7 @@
|
||||
package org.enso.common;
|
||||
|
||||
public final class Asserts {
|
||||
private Asserts() {
|
||||
}
|
||||
private Asserts() {}
|
||||
|
||||
public static void assertInJvm(boolean check) {
|
||||
assert check;
|
||||
|
@ -4,7 +4,6 @@ import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.util.Map;
|
||||
|
||||
import org.enso.logger.Converter;
|
||||
import org.enso.logger.JulHandler;
|
||||
import org.enso.logging.config.LoggerSetup;
|
||||
@ -52,7 +51,7 @@ public final class ContextFactory {
|
||||
private String checkForWarnings;
|
||||
private int warningsLimit = 100;
|
||||
private java.util.Map<String, String> options = java.util.Collections.emptyMap();
|
||||
private boolean enableDebugServer;
|
||||
private boolean enableDebugServer;
|
||||
|
||||
private ContextFactory() {}
|
||||
|
||||
|
@ -2,9 +2,8 @@ package org.enso.common;
|
||||
|
||||
/** Container for debug server related constants. */
|
||||
public class DebugServerInfo {
|
||||
private DebugServerInfo() {
|
||||
private DebugServerInfo() {}
|
||||
|
||||
}
|
||||
public static final String URI = "enso://debug-server";
|
||||
public static final String INSTRUMENT_NAME = "enso-debug-server";
|
||||
public static final String ENABLE_OPTION = INSTRUMENT_NAME + ".enable";
|
||||
|
@ -1,7 +1,6 @@
|
||||
package org.enso.common;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import org.graalvm.options.OptionDescriptor;
|
||||
import org.graalvm.options.OptionDescriptors;
|
||||
import org.graalvm.options.OptionKey;
|
||||
@ -9,6 +8,7 @@ import org.graalvm.options.OptionKey;
|
||||
/** Class representing runtime options supported by the Enso engine. */
|
||||
public final class RuntimeOptions {
|
||||
private RuntimeOptions() {}
|
||||
|
||||
public static final String PROJECT_ROOT = optionName("projectRoot");
|
||||
public static final OptionKey<String> PROJECT_ROOT_KEY = new OptionKey<>("");
|
||||
private static final OptionDescriptor PROJECT_ROOT_DESCRIPTOR =
|
||||
@ -54,7 +54,7 @@ public final class RuntimeOptions {
|
||||
public static final String DISABLE_LINTING = optionName("disableLinting");
|
||||
public static final OptionKey<Boolean> DISABLE_LINTING_KEY = new OptionKey<>(false);
|
||||
public static final OptionDescriptor DISABLE_LINTING_DESCRIPTOR =
|
||||
OptionDescriptor.newBuilder(DISABLE_LINTING_KEY, DISABLE_LINTING).build();
|
||||
OptionDescriptor.newBuilder(DISABLE_LINTING_KEY, DISABLE_LINTING).build();
|
||||
|
||||
public static final String INTERPRETER_SEQUENTIAL_COMMAND_EXECUTION =
|
||||
interpreterOptionName("sequentialCommandExecution");
|
||||
|
Loading…
Reference in New Issue
Block a user