Define Editions (#1797)

.github/workflows/nightly.yml

@@ -65,6 +65,13 @@ jobs:
         uses: actions/checkout@v2
         with:
           path: repo
+      - name: Configure Pagefile (Windows)
+        if: runner.os == 'Windows'
+        uses: al-cheb/[email protected]
+        with:
+          minimum-size: 16GB
+          maximum-size: 16GB
+          disk-root: "C:"
       - name: Enable Developer Command Prompt (Windows)
         uses: ilammy/[email protected]
       - name: Disable TCP/UDP Offloading (macOS)

.github/workflows/release.yml

@@ -32,6 +32,13 @@ jobs:
         uses: actions/checkout@v2
         with:
           path: repo
+      - name: Configure Pagefile (Windows)
+        if: runner.os == 'Windows'
+        uses: al-cheb/[email protected]
+        with:
+          minimum-size: 16GB
+          maximum-size: 16GB
+          disk-root: "C:"
       - name: Enable Developer Command Prompt (Windows)
         uses: ilammy/[email protected]
       - name: Disable TCP/UDP Offloading (macOS)

.github/workflows/scala.yml

@@ -27,6 +27,13 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
+      - name: Configure Pagefile (Windows)
+        if: runner.os == 'Windows'
+        uses: al-cheb/[email protected]
+        with:
+          minimum-size: 16GB
+          maximum-size: 16GB
+          disk-root: "C:"
       - name: Enable Developer Command Prompt (Windows)
         uses: ilammy/[email protected]
       - name: Setup Go

RELEASES.md

@@ -39,6 +39,18 @@
 - Added support for multiple content roots in the language server
   ([#1800](https://github.com/enso-org/enso/pull/1800/)). It is not yet exposed
   to the IDE, as this will be done as part of future work.
+- Modified the `package.yaml` format in preparation for the library ecosystem
+  ([#1797](https://github.com/enso-org/enso/pull/1797)). The `engine-version`
+  field has been deprecated in favour of an `edition` field that allows to set
+  up the engine version and dependency resolution using the upcoming Edition
+  system. New tools will still be able to read the old format, but upon
+  modification, they will save changes in the new format. As the `edition` file
+  did not exist in the older version, old tools will actually correctly load the
+  migrated package file (as we allow for unknown fields), but they will not know
+  how to interpret the new `edition` field and so will fall back to using the
+  `default` engine version, which may be unexpected. Ideally, after migration,
+  the project should be used only with the new tools. The affected tools are the
+  Launcher and the Project Manager.
 
 ## Libraries
 

build.sbt

@@ -583,11 +583,11 @@ lazy val pkg = (project in file("lib/scala/pkg"))
     version := "0.1",
     libraryDependencies ++= circe ++ Seq(
       "org.scalatest" %% "scalatest"  % scalatestVersion % Test,
-      "nl.gn0s1s"     %% "bump"       % bumpVersion,
       "io.circe"      %% "circe-yaml" % circeYamlVersion, // separate from other circe deps because its independent project with its own versioning
       "commons-io"     % "commons-io" % commonsIoVersion
     )
   )
+  .dependsOn(editions)
 
 lazy val `akka-native` = project
   .in(file("lib/scala/akka-native"))
@@ -728,9 +728,12 @@ lazy val `project-manager` = (project in file("lib/scala/project-manager"))
   )
   .dependsOn(`akka-native`)
   .dependsOn(`version-output`)
-  .dependsOn(pkg)
+  .dependsOn(editions)
+  .dependsOn(cli)
   .dependsOn(`polyglot-api`)
   .dependsOn(`runtime-version-manager`)
+  .dependsOn(`library-manager`)
+  .dependsOn(pkg)
   .dependsOn(`json-rpc-server`)
   .dependsOn(`json-rpc-server-test` % Test)
   .dependsOn(testkit % Test)
@@ -883,6 +886,7 @@ lazy val `polyglot-api` = project
   .dependsOn(pkg)
   .dependsOn(`text-buffer`)
   .dependsOn(`logging-utils`)
+  .dependsOn(testkit % Test)
 
 lazy val `language-server` = (project in file("engine/language-server"))
   .settings(
@@ -1184,8 +1188,53 @@ lazy val launcher = project
   .dependsOn(`version-output`)
   .dependsOn(pkg)
   .dependsOn(`logging-service`)
+  .dependsOn(`distribution-manager` % Test)
   .dependsOn(`runtime-version-manager-test` % Test)
 
+lazy val `distribution-manager` = project
+  .in(file("lib/scala/distribution-manager"))
+  .configs(Test)
+  .settings(
+    resolvers += Resolver.bintrayRepo("gn0s1s", "releases"),
+    libraryDependencies ++= Seq(
+      "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
+      "io.circe"                   %% "circe-yaml"    % circeYamlVersion,
+      "commons-io"                  % "commons-io"    % commonsIoVersion,
+      "org.scalatest"              %% "scalatest"     % scalatestVersion % Test
+    )
+  )
+  .dependsOn(editions)
+  .dependsOn(pkg)
+  .dependsOn(`logging-utils`)
+
+lazy val editions = project
+  .in(file("lib/scala/editions"))
+  .configs(Test)
+  .settings(
+    resolvers += Resolver.bintrayRepo("gn0s1s", "releases"),
+    libraryDependencies ++= Seq(
+      "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
+      "nl.gn0s1s"                  %% "bump"          % bumpVersion,
+      "io.circe"                   %% "circe-yaml"    % circeYamlVersion,
+      "org.scalatest"              %% "scalatest"     % scalatestVersion % Test
+    )
+  )
+
+lazy val `library-manager` = project
+  .in(file("lib/scala/library-manager"))
+  .configs(Test)
+  .settings(
+    resolvers += Resolver.bintrayRepo("gn0s1s", "releases"),
+    libraryDependencies ++= Seq(
+      "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion,
+      "org.scalatest"              %% "scalatest"     % scalatestVersion % Test
+    )
+  )
+  .dependsOn(editions)
+  .dependsOn(cli)
+  .dependsOn(`distribution-manager`)
+  .dependsOn(testkit % Test)
+
 lazy val `runtime-version-manager` = project
   .in(file("lib/scala/runtime-version-manager"))
   .configs(Test)
@@ -1204,6 +1253,7 @@ lazy val `runtime-version-manager` = project
   .dependsOn(`logging-service`)
   .dependsOn(cli)
   .dependsOn(`version-output`)
+  .dependsOn(`distribution-manager`)
 
 lazy val `runtime-version-manager-test` = project
   .in(file("lib/scala/runtime-version-manager-test"))
@@ -1224,6 +1274,8 @@ lazy val `runtime-version-manager-test` = project
   .dependsOn(`runtime-version-manager`)
   .dependsOn(`logging-service`)
   .dependsOn(testkit)
+  .dependsOn(cli)
+  .dependsOn(`distribution-manager`)
 
 lazy val `locking-test-helper` = project
   .in(file("lib/scala/locking-test-helper"))

distribution/engine/THIRD-PARTY/NOTICE

@@ -26,6 +26,11 @@ The license information can be found along with the copyright notices.
 Copyright notices related to this dependency can be found in the directory `com.thoughtworks.paranamer.paranamer-2.8`.
 
 
+'slf4j-api', licensed under the MIT License, is distributed with the engine.
+The license file can be found at `licenses/MIT`.
+Copyright notices related to this dependency can be found in the directory `org.slf4j.slf4j-api-1.7.26`.
+
+
 'izumi-reflect_2.13', licensed under the BSD-style, 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 `dev.zio.izumi-reflect_2.13-1.0.0-M5`.
@@ -246,11 +251,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.typesafe.scala-logging.scala-logging_2.13-3.9.2`.
 
 
-'slf4j-api', licensed under the MIT License, is distributed with the engine.
-The license file can be found at `licenses/MIT`.
-Copyright notices related to this dependency can be found in the directory `org.slf4j.slf4j-api-1.7.25`.
-
-
 'commons-cli', 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 `commons-cli.commons-cli-1.4`.

distribution/engine/THIRD-PARTY/com.google.auto.service.auto-service-1.0-rc7/NOTICES

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2013 Google LLC
+ *
+ * Licensed 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.
+ */
+
 /*
  * Copyright 2008 Google LLC
  *
@@ -14,20 +28,6 @@
  * limitations under the License.
  */
 
-/*
- * Copyright 2013 Google LLC
- *
- * Licensed 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.
- */
-
 /*
  * Copyright 2008 Google LLC
  *

distribution/engine/THIRD-PARTY/com.google.errorprone.error_prone_annotations-2.3.4/NOTICES

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 The Error Prone Authors.
+ * Copyright 2016 The Error Prone Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright 2016 The Error Prone Authors.
+ * Copyright 2015 The Error Prone Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
  */
 
 /*
- * Copyright 2015 The Error Prone Authors.
+ * Copyright 2014 The Error Prone Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

distribution/engine/THIRD-PARTY/com.typesafe.akka.akka-http-spray-json_2.13-10.2.0-RC1/NOTICES

@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2009-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2017-2020 Lightbend Inc. <https://www.lightbend.com>
  */
 
 /*
- * Copyright (C) 2017-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2009-2020 Lightbend Inc. <https://www.lightbend.com>
  */

distribution/engine/THIRD-PARTY/dev.zio.zio_2.13-1.0.1/NOTICES

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-Copyright 2017-2019 John A. De Goes and the ZIO Contributors
-
 /*
  * Copyright 2017-2020 John A. De Goes and the ZIO Contributors
  * Copyright 2017-2018 Łukasz Biały, Paul Chiusano, Michael Pilquist,
@@ -36,3 +34,5 @@ Copyright 2017-2019 John A. De Goes and the ZIO Contributors
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+Copyright 2017-2019 John A. De Goes and the ZIO Contributors

distribution/engine/THIRD-PARTY/io.spray.spray-json_2.13-1.3.5/NOTICES

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011,2012 Mathias Doenitz, Johannes Rudolph
+ * Copyright (C) 2011 Mathias Doenitz
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright (C) 2011 Mathias Doenitz
+ * Copyright (C) 2011,2012 Mathias Doenitz, Johannes Rudolph
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

distribution/project-manager/THIRD-PARTY/com.typesafe.akka.akka-http-spray-json_2.13-10.2.0-RC1/NOTICES

@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2009-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2017-2020 Lightbend Inc. <https://www.lightbend.com>
  */
 
 /*
- * Copyright (C) 2017-2020 Lightbend Inc. <https://www.lightbend.com>
+ * Copyright (C) 2009-2020 Lightbend Inc. <https://www.lightbend.com>
  */

distribution/project-manager/THIRD-PARTY/dev.zio.zio_2.13-1.0.1/NOTICES

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-Copyright 2017-2019 John A. De Goes and the ZIO Contributors
-
 /*
  * Copyright 2017-2020 John A. De Goes and the ZIO Contributors
  * Copyright 2017-2018 Łukasz Biały, Paul Chiusano, Michael Pilquist,
@@ -36,3 +34,5 @@ Copyright 2017-2019 John A. De Goes and the ZIO Contributors
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+Copyright 2017-2019 John A. De Goes and the ZIO Contributors

distribution/project-manager/THIRD-PARTY/io.spray.spray-json_2.13-1.3.5/NOTICES

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011,2012 Mathias Doenitz, Johannes Rudolph
+ * Copyright (C) 2011 Mathias Doenitz
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright (C) 2011 Mathias Doenitz
+ * Copyright (C) 2011,2012 Mathias Doenitz, Johannes Rudolph
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

docs/README.md

@@ -47,3 +47,4 @@ It is broken up into categories as follows:
 - [**Parser:**](./parser) Design and specification of the Enso parser.
 - [**Infrastructure:**](./infrastructure) Description of the infrastructure for
   building Enso.
+- [**Libraries:**](./libraries) Description of Enso's Library Ecosystem.