Integrating Runtime Version Manager with Project Manager (#1285)

Related to #1153, implements the first part of the integration, without the parts that use the runner which will be done next. Temporarily there are two logger implementations - this will be alleviated with the next part - when and the direct classpath dependency on the language server is removed.
enso-org · Nov 16, 2020 · 4d5f794 · 4d5f794
1 parent bc8a22e
commit 4d5f794
Show file tree

Hide file tree

Showing 115 changed files with 2,486 additions and 638 deletions.
diff --git a/build.sbt b/build.sbt
@@ -240,7 +240,7 @@ val akka =
     akkaHttp,
     akkaSpray,
     akkaTyped
-  ) ++ akkaTest
+  )
 
 // === Cats ===================================================================
 
@@ -518,7 +518,7 @@ lazy val `lexer-bench` =
 lazy val `parser-service` = (project in file("lib/scala/parser-service"))
   .dependsOn(syntax.jvm)
   .settings(
-    libraryDependencies ++= akka,
+    libraryDependencies ++= akka ++ akkaTest,
     mainClass := Some("org.enso.ParserServiceMain")
   )
 
@@ -660,7 +660,6 @@ lazy val `project-manager` = (project in file("lib/scala/project-manager"))
     libraryDependencies ++= Seq(
       "com.typesafe"                % "config"              % typesafeConfigVersion,
       "com.github.pureconfig"      %% "pureconfig"          % pureconfigVersion,
-      "ch.qos.logback"              % "logback-classic"     % logbackClassicVersion,
       "com.typesafe.scala-logging" %% "scala-logging"       % scalaLoggingVersion,
       "dev.zio"                    %% "zio"                 % zioVersion,
       "dev.zio"                    %% "zio-interop-cats"    % zioInteropCatsVersion,
@@ -705,9 +704,11 @@ lazy val `project-manager` = (project in file("lib/scala/project-manager"))
   .dependsOn(`version-output`)
   .dependsOn(pkg)
   .dependsOn(`language-server`)
+  .dependsOn(`runtime-version-manager`)
   .dependsOn(`json-rpc-server`)
   .dependsOn(`json-rpc-server-test` % Test)
   .dependsOn(testkit % Test)
+  .dependsOn(`runtime-version-manager-test` % Test)
 
 /* Note [Classpath Separation]
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -734,7 +735,7 @@ lazy val `project-manager` = (project in file("lib/scala/project-manager"))
 lazy val `json-rpc-server` = project
   .in(file("lib/scala/json-rpc-server"))
   .settings(
-    libraryDependencies ++= akka,
+    libraryDependencies ++= akka ++ akkaTest,
     libraryDependencies ++= circe,
     libraryDependencies ++= Seq(
       "io.circe"      %% "circe-literal" % circeVersion,
@@ -866,7 +867,7 @@ lazy val `polyglot-api` = project
 
 lazy val `language-server` = (project in file("engine/language-server"))
   .settings(
-    libraryDependencies ++= akka ++ circe ++ Seq(
+    libraryDependencies ++= akka ++ akkaTest ++ circe ++ Seq(
       "ch.qos.logback"              % "logback-classic"      % logbackClassicVersion,
       "com.typesafe.scala-logging" %% "scala-logging"        % scalaLoggingVersion,
       "io.circe"                   %% "circe-generic-extras" % circeGenericExtrasVersion,

diff --git a/distribution/engine/THIRD-PARTY/NOTICE b/distribution/engine/THIRD-PARTY/NOTICE
@@ -21,6 +21,11 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `dev.zio.zio-interop-cats_2.13-2.1.4.0`.
 
 
+'commons-compress', licensed under the Apache License, Version 2.0, is distributed with the engine.
+The license file can be found at `licenses/APACHE2.0`.
+Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-compress-1.20`.
+
+
 'checker-qual', licensed under the The MIT License, is distributed with the engine.
 The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `org.checkerframework.checker-qual-2.11.1`.

diff --git a/distribution/engine/THIRD-PARTY/org.apache.commons.commons-compress-1.20/NOTICE.txt b/distribution/engine/THIRD-PARTY/org.apache.commons.commons-compress-1.20/NOTICE.txt
@@ -0,0 +1,55 @@
+Apache Commons Compress
+Copyright 2002-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+---
+
+The files in the package org.apache.commons.compress.archivers.sevenz
+were derived from the LZMA SDK, version 9.20 (C/ and CPP/7zip/),
+which has been placed in the public domain:
+
+"LZMA SDK is placed in the public domain." (http://www.7-zip.org/sdk.html)
+
+---
+
+The test file lbzip2_32767.bz2 has been copied from libbzip2's source
+repository:
+
+This program, "bzip2", the associated library "libbzip2", and all
+documentation, are copyright (C) 1996-2019 Julian R Seward.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. The origin of this software must not be misrepresented; you must 
+   not claim that you wrote the original software.  If you use this 
+   software in a product, an acknowledgment in the product 
+   documentation would be appreciated but is not required.
+
+3. Altered source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+4. The name of the author may not be used to endorse or promote 
+   products derived from this software without specific prior written 
+   permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, jseward@acm.org
diff --git a/distribution/engine/THIRD-PARTY/org.apache.commons.commons-compress-1.20/NOTICES b/distribution/engine/THIRD-PARTY/org.apache.commons.commons-compress-1.20/NOTICES
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Some portions of this file Copyright (c) 2004-2006 Intel Corportation
+ * and licensed under the BSD license.
+ */
diff --git a/distribution/launcher/THIRD-PARTY/NOTICE b/distribution/launcher/THIRD-PARTY/NOTICE
@@ -16,7 +16,7 @@ licensed under the MIT license. Its copyright notice is included in file `COPYRI
 
 
 'commons-compress', licensed under the Apache License, Version 2.0, is distributed with the launcher.
-The license information can be found along with the copyright notices.
+The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `org.apache.commons.commons-compress-1.20`.
 
 

diff --git a/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-compress-1.20/LICENSE.txt b/distribution/launcher/THIRD-PARTY/org.apache.commons.commons-compress-1.20/LICENSE.txt