diff --git a/build.sbt b/build.sbt index d780d49e80..5e71a3ac4a 100644 --- a/build.sbt +++ b/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( diff --git a/engine/common/src/main/java/org/enso/common/Asserts.java b/engine/common/src/main/java/org/enso/common/Asserts.java index 8d3001f636..5565bf92ea 100644 --- a/engine/common/src/main/java/org/enso/common/Asserts.java +++ b/engine/common/src/main/java/org/enso/common/Asserts.java @@ -1,8 +1,7 @@ package org.enso.common; public final class Asserts { - private Asserts() { - } + private Asserts() {} public static void assertInJvm(boolean check) { assert check; diff --git a/engine/common/src/main/java/org/enso/common/ContextFactory.java b/engine/common/src/main/java/org/enso/common/ContextFactory.java index 6396215314..732280d943 100644 --- a/engine/common/src/main/java/org/enso/common/ContextFactory.java +++ b/engine/common/src/main/java/org/enso/common/ContextFactory.java @@ -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 options = java.util.Collections.emptyMap(); - private boolean enableDebugServer; + private boolean enableDebugServer; private ContextFactory() {} diff --git a/engine/common/src/main/java/org/enso/common/DebugServerInfo.java b/engine/common/src/main/java/org/enso/common/DebugServerInfo.java index 184181edb6..0282486368 100644 --- a/engine/common/src/main/java/org/enso/common/DebugServerInfo.java +++ b/engine/common/src/main/java/org/enso/common/DebugServerInfo.java @@ -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"; diff --git a/engine/common/src/main/java/org/enso/common/RuntimeOptions.java b/engine/common/src/main/java/org/enso/common/RuntimeOptions.java index 35eaf43881..65bec92ef9 100644 --- a/engine/common/src/main/java/org/enso/common/RuntimeOptions.java +++ b/engine/common/src/main/java/org/enso/common/RuntimeOptions.java @@ -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 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 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");