Fix a crash due to shadowed project names (#1571)

.github/workflows/release.yml

@@ -198,8 +198,7 @@ jobs:
           sbt "enso/verifyGeneratedPackage engine ${{ env.ENGINE_DIST_DIR }}/THIRD-PARTY"
           sbt "enso/verifyGeneratedPackage launcher ${{ env.LAUNCHER_DIST_DIR }}/THIRD-PARTY"
           sbt "enso/verifyGeneratedPackage project-manager ${{ env.PROJECTMANAGER_DIST_DIR }}/THIRD-PARTY"
-          sbt "enso/verifyGeneratedPackage std-lib-Base ${{ env.ENGINE_DIST_DIR }}/std-lib/Base/THIRD-PARTY"
-          sbt "enso/verifyGeneratedPackage std-lib-Table ${{ env.ENGINE_DIST_DIR }}/std-lib/Table/THIRD-PARTY"
+          sbt "enso/verifyGeneratedPackage Standard ${{ env.ENGINE_DIST_DIR }}/std-lib/Standard/THIRD-PARTY"
 
       # Publish
       - name: Upload the Engine Artifact

build.sbt

@@ -67,20 +67,10 @@ GatherLicenses.distributions := Seq(
     Distribution.sbtProjects(`project-manager`)
   ),
   Distribution(
-    "std-lib-Base",
-    file("distribution/std-lib/Base/THIRD-PARTY"),
+    "Standard",
+    file("distribution/std-lib/Standard/THIRD-PARTY"),
     Distribution.sbtProjects(`std-bits`)
   ),
-  Distribution(
-    "std-lib-Table",
-    file("distribution/std-lib/Table/THIRD-PARTY"),
-    Distribution.sbtProjects(table)
-  ),
-  Distribution(
-    "std-lib-Database",
-    file("distribution/std-lib/Database/THIRD-PARTY"),
-    Distribution.sbtProjects(database)
-  )
 )
 GatherLicenses.licenseConfigurations := Set("compile")
 GatherLicenses.configurationRoot := file("tools/legal-review")
@@ -384,7 +374,7 @@ val declineVersion          = "1.2.0"
 val directoryWatcherVersion = "0.9.10"
 val flatbuffersVersion      = "1.12.0"
 val guavaVersion            = "29.0-jre"
-val jlineVersion            = "3.15.0"
+val jlineVersion            = "3.19.0"
 val kindProjectorVersion    = "0.11.3"
 val mockitoScalaVersion     = "1.14.8"
 val newtypeVersion          = "0.4.4"
@@ -1035,8 +1025,6 @@ lazy val runtime = (project in file("engine/runtime"))
   .settings(
     (Runtime / compile) := (Runtime / compile)
       .dependsOn(`std-bits` / Compile / packageBin)
-      .dependsOn(table / Compile / packageBin)
-      .dependsOn(database / Compile / packageBin)
       .value
   )
   .settings(
@@ -1255,24 +1243,24 @@ lazy val `locking-test-helper` = project
   )
 
 val `std-lib-root`           = file("distribution/std-lib/")
-val `std-lib-polyglot-root`  = `std-lib-root` / "Base" / "polyglot" / "java"
-val `table-polyglot-root`    = `std-lib-root` / "Table" / "polyglot" / "java"
-val `database-polyglot-root` = `std-lib-root` / "Database" / "polyglot" / "java"
+val `standard-polyglot-root` = `std-lib-root` / "Standard" / "polyglot" / "java"
 
 lazy val `std-bits` = project
   .in(file("std-bits"))
   .settings(
     autoScalaLibrary := false,
     Compile / packageBin / artifactPath :=
-      `std-lib-polyglot-root` / "std-bits.jar",
+      `standard-polyglot-root` / "std-bits.jar",
     libraryDependencies ++= Seq(
-      "com.ibm.icu" % "icu4j" % icuVersion
+      "com.ibm.icu"   % "icu4j"             % icuVersion,
+      "com.univocity" % "univocity-parsers" % "2.9.0",
+      "org.xerial"    % "sqlite-jdbc"       % "3.34.0"
     ),
     Compile / packageBin := Def.task {
       val result = (Compile / packageBin).value
       val _ = StdBits
         .copyDependencies(
-          `std-lib-polyglot-root`,
+          `standard-polyglot-root`,
           Some("std-bits.jar"),
           ignoreScalaLibrary = true
         )
@@ -1281,48 +1269,6 @@ lazy val `std-bits` = project
     }.value
   )
 
-lazy val table = project
-  .in(file("table"))
-  .settings(
-    autoScalaLibrary := false,
-    Compile / packageBin / artifactPath :=
-      `table-polyglot-root` / "table.jar",
-    libraryDependencies ++= Seq(
-      "com.univocity" % "univocity-parsers" % "2.9.0"
-    ),
-    Compile / packageBin := Def.task {
-      val result = (Compile / packageBin).value
-      val _ = StdBits
-        .copyDependencies(
-          `table-polyglot-root`,
-          Some("table.jar"),
-          ignoreScalaLibrary = true
-        )
-        .value
-      result
-    }.value
-  )
-
-lazy val database = project
-  .in(file("database"))
-  .settings(
-    autoScalaLibrary := false,
-    libraryDependencies ++= Seq(
-      "org.xerial" % "sqlite-jdbc" % "3.34.0"
-    ),
-    Compile / packageBin := Def.task {
-      val result = (Compile / packageBin).value
-      val _ = StdBits
-        .copyDependencies(
-          `database-polyglot-root`,
-          None,
-          ignoreScalaLibrary = true
-        )
-        .value
-      result
-    }.value
-  )
-
 /* Note [HTTPS in the Native Images]
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  * The launcher and project-manager use Akka Http for making web requests. They

distribution/engine/THIRD-PARTY/NOTICE

@@ -36,11 +36,6 @@ The license file can be found at `licenses/APACHE2.0`.
 Copyright notices related to this dependency can be found in the directory `com.fasterxml.jackson.core.jackson-annotations-2.11.1`.
 
 
-'jline', licensed under the The BSD 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.jline.jline-3.15.0`.
-
-
 'sqlite-jdbc', licensed under the The Apache Software License, Version 2.0, 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.xerial.sqlite-jdbc-3.31.1`.