move files

chester-lang · Oct 23, 2024 · 07a5e71 · 07a5e71
1 parent 688f449
commit 07a5e71
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -455,17 +455,6 @@ def useSpire(
       )
     )
 
-lazy val base = crossProject(JSPlatform, JVMPlatform, NativePlatform)
-  .withoutSuffixFor(JVMPlatform)
-  .crossType(CrossType.Pure)
-  .in(file("base"))
-  .settings(
-    name := "base",
-    commonSettings,
-    baseDeps
-  )
-  .jvmSettings(commonJvmLibSettings)
-
 lazy val pretty = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Pure)
@@ -494,7 +483,7 @@ lazy val syntax = useSpire(
     .withoutSuffixFor(JVMPlatform)
     .crossType(CrossType.Pure)
     .in(file("syntax"))
-    .dependsOn(base, pretty)
+    .dependsOn(utils, pretty)
     .settings(
       name := "syntax",
       commonSettings
@@ -517,7 +506,7 @@ lazy val tyck = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Pure)
   .in(file("tyck"))
-  .dependsOn(base, syntax, err)
+  .dependsOn(utils, syntax, err)
   .settings(
     name := "tyck",
     commonSettings
@@ -541,7 +530,7 @@ lazy val compiler = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Full)
   .in(file("compiler"))
-  .dependsOn(base, syntax, err)
+  .dependsOn(utils, syntax, err)
   .jvmConfigure(_.dependsOn(compiler213.jvm))
   .jsConfigure(_.dependsOn(compiler213.js))
   .settings(
@@ -708,7 +697,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Pure)
   .in(file("core"))
-  .dependsOn(base, parser, syntax, pretty, tyck)
+  .dependsOn(utils, parser, syntax, pretty, tyck)
   .settings(
     name := "core",
     assembly / assemblyOutputPath := file("target") / "chester-core.jar",
@@ -1304,7 +1293,6 @@ lazy val root = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     effektKiama,
     jsTypings,
     utils,
-    base,
     parser,
     compiler,
     compiler213,

diff --git a/base/src/main/scala/chester/i18n/i18n.scala → ...ed/src/main/scala/chester/i18n/i18n.scala b/base/src/main/scala/chester/i18n/i18n.scala → ...ed/src/main/scala/chester/i18n/i18n.scala
diff --git a/.../src/main/scala/chester/i18n/macros.scala → .../src/main/scala/chester/i18n/macros.scala b/.../src/main/scala/chester/i18n/macros.scala → .../src/main/scala/chester/i18n/macros.scala
diff --git a/.../src/main/scala/chester/utils/io/IO.scala → .../src/main/scala/chester/utils/io/IO.scala b/.../src/main/scala/chester/utils/io/IO.scala → .../src/main/scala/chester/utils/io/IO.scala
diff --git a/...rc/main/scala/chester/utils/io/Path.scala → ...rc/main/scala/chester/utils/io/Path.scala b/...rc/main/scala/chester/utils/io/Path.scala → ...rc/main/scala/chester/utils/io/Path.scala
diff --git a/...ester/utils/term/AbstractInTerminal.scala → ...ester/utils/term/AbstractInTerminal.scala b/...ester/utils/term/AbstractInTerminal.scala → ...ester/utils/term/AbstractInTerminal.scala
diff --git a/...cala/chester/utils/term/InputStatus.scala → ...cala/chester/utils/term/InputStatus.scala b/...cala/chester/utils/term/InputStatus.scala → ...cala/chester/utils/term/InputStatus.scala
diff --git a/...a/chester/utils/term/ReadLineResult.scala → ...a/chester/utils/term/ReadLineResult.scala b/...a/chester/utils/term/ReadLineResult.scala → ...a/chester/utils/term/ReadLineResult.scala
diff --git a/...a/chester/utils/term/SimpleTerminal.scala → ...a/chester/utils/term/SimpleTerminal.scala b/...a/chester/utils/term/SimpleTerminal.scala → ...a/chester/utils/term/SimpleTerminal.scala
diff --git a/...n/scala/chester/utils/term/Terminal.scala → ...n/scala/chester/utils/term/Terminal.scala b/...n/scala/chester/utils/term/Terminal.scala → ...n/scala/chester/utils/term/Terminal.scala
diff --git a/...ala/chester/utils/term/TerminalInfo.scala → ...ala/chester/utils/term/TerminalInfo.scala b/...ala/chester/utils/term/TerminalInfo.scala → ...ala/chester/utils/term/TerminalInfo.scala
diff --git a/...ala/chester/utils/term/TerminalInit.scala → ...ala/chester/utils/term/TerminalInit.scala b/...ala/chester/utils/term/TerminalInit.scala → ...ala/chester/utils/term/TerminalInit.scala