Skip to content

Commit

Permalink
minimize-modules: core-lib module removed
Browse files Browse the repository at this point in the history
  • Loading branch information
aslesarenko committed Aug 21, 2023
1 parent fc6fdb0 commit 913baec
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 27 deletions.
55 changes: 28 additions & 27 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ lazy val common = crossProject(JVMPlatform, JSPlatform)
.settings(commonSettings ++ testSettings2,
commonDependenies2,
testingDependencies2,
scryptoDependency,
publish / skip := true
)
.jvmSettings( crossScalaSettings )
Expand All @@ -212,32 +213,32 @@ lazy val common = crossProject(JVMPlatform, JSPlatform)
lazy val commonJS = common.js
.enablePlugins(ScalaJSBundlerPlugin)

lazy val corelib = crossProject(JVMPlatform, JSPlatform)
.in(file("core-lib"))
.dependsOn(common % allConfigDependency)
.settings(commonSettings ++ testSettings2,
commonDependenies2,
testingDependencies2,
crossScalaSettings,
scryptoDependency,
publish / skip := true
)
.jvmSettings(
crossScalaSettings
)
.jsSettings(
crossScalaSettingsJS,
libraryDependencies ++= Seq(
"org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0"
),
useYarn := true
)
lazy val corelibJS = corelib.js
.enablePlugins(ScalaJSBundlerPlugin)
//lazy val corelib = crossProject(JVMPlatform, JSPlatform)
// .in(file("core-lib"))
// .dependsOn(common % allConfigDependency)
// .settings(commonSettings ++ testSettings2,
// commonDependenies2,
// testingDependencies2,
// crossScalaSettings,
// scryptoDependency,
// publish / skip := true
// )
// .jvmSettings(
// crossScalaSettings
// )
// .jsSettings(
// crossScalaSettingsJS,
// libraryDependencies ++= Seq(
// "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0"
// ),
// useYarn := true
// )
//lazy val corelibJS = corelib.js
// .enablePlugins(ScalaJSBundlerPlugin)

lazy val graphir = crossProject(JVMPlatform, JSPlatform)
.in(file("graph-ir"))
.dependsOn(common % allConfigDependency, corelib % allConfigDependency)
.dependsOn(common % allConfigDependency)
.settings(
commonDependenies2,
scryptoDependency,
Expand All @@ -256,7 +257,7 @@ lazy val graphirJS = graphir.js

lazy val interpreter = crossProject(JVMPlatform, JSPlatform)
.in(file("interpreter"))
.dependsOn(corelib % allConfigDependency)
.dependsOn(common % allConfigDependency)
.settings(
commonSettings ++ testSettings2,
commonDependenies2,
Expand Down Expand Up @@ -319,7 +320,7 @@ lazy val parsersJS = parsers.js

lazy val sdk = crossProject(JVMPlatform, JSPlatform)
.in(file("sdk"))
.dependsOn(corelib % allConfigDependency, interpreter % allConfigDependency, parsers % allConfigDependency)
.dependsOn(common % allConfigDependency, interpreter % allConfigDependency, parsers % allConfigDependency)
.settings(commonSettings ++ testSettings2,
commonDependenies2,
testingDependencies2,
Expand Down Expand Up @@ -396,13 +397,13 @@ lazy val scJS = sc.js


lazy val sigma = (project in file("."))
.aggregate(common.jvm, corelib.jvm, graphir.jvm, interpreter.jvm, parsers.jvm, sc.jvm, sdk.jvm)
.aggregate(common.jvm, graphir.jvm, interpreter.jvm, parsers.jvm, sc.jvm, sdk.jvm)
.settings(libraryDefSettings, rootSettings)
.settings(publish / aggregate := false)
.settings(publishLocal / aggregate := false)

lazy val aggregateCompile = ScopeFilter(
inProjects(common.jvm, corelib.jvm, graphir.jvm, interpreter.jvm, parsers.jvm, sc.jvm, sdk.jvm),
inProjects(common.jvm, graphir.jvm, interpreter.jvm, parsers.jvm, sc.jvm, sdk.jvm),
inConfigurations(Compile))

lazy val rootSettings = Seq(
Expand Down

0 comments on commit 913baec

Please sign in to comment.