From 913baecb74c522c5b6a45b9ab5bda816f702e25c Mon Sep 17 00:00:00 2001 From: Alexander Slesarenko Date: Mon, 21 Aug 2023 23:16:22 +0200 Subject: [PATCH] minimize-modules: core-lib module removed --- build.sbt | 55 ++++++++++--------- .../scala/special/CoreLibReflection.scala | 0 .../shared/src/main/scala/special/Types.scala | 0 .../main/scala/special/collection/Colls.scala | 0 .../special/collection/CollsOverArrays.scala | 0 .../scala/special/collection/Extensions.scala | 0 .../scala/special/collection/Helpers.scala | 0 .../scala/special/collection/package.scala | 0 .../main/scala/special/sigma/SigmaDsl.scala | 0 .../main/scala/special/sigma/package.scala | 0 .../scala/special/wrappers/WrappersSpec.scala | 0 .../src/test/scala/special/TypesTests.scala | 0 .../scala/special/collections/CollGens.scala | 0 .../special/collections/CollsTests.scala | 0 14 files changed, 28 insertions(+), 27 deletions(-) rename {core-lib => common}/shared/src/main/scala/special/CoreLibReflection.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/Types.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/collection/Colls.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/collection/CollsOverArrays.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/collection/Extensions.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/collection/Helpers.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/collection/package.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/sigma/SigmaDsl.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/sigma/package.scala (100%) rename {core-lib => common}/shared/src/main/scala/special/wrappers/WrappersSpec.scala (100%) rename {core-lib => common}/shared/src/test/scala/special/TypesTests.scala (100%) rename {core-lib => common}/shared/src/test/scala/special/collections/CollGens.scala (100%) rename {core-lib => common}/shared/src/test/scala/special/collections/CollsTests.scala (100%) diff --git a/build.sbt b/build.sbt index 31d769e1e2..6317755a75 100644 --- a/build.sbt +++ b/build.sbt @@ -193,6 +193,7 @@ lazy val common = crossProject(JVMPlatform, JSPlatform) .settings(commonSettings ++ testSettings2, commonDependenies2, testingDependencies2, + scryptoDependency, publish / skip := true ) .jvmSettings( crossScalaSettings ) @@ -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, @@ -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, @@ -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, @@ -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( diff --git a/core-lib/shared/src/main/scala/special/CoreLibReflection.scala b/common/shared/src/main/scala/special/CoreLibReflection.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/CoreLibReflection.scala rename to common/shared/src/main/scala/special/CoreLibReflection.scala diff --git a/core-lib/shared/src/main/scala/special/Types.scala b/common/shared/src/main/scala/special/Types.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/Types.scala rename to common/shared/src/main/scala/special/Types.scala diff --git a/core-lib/shared/src/main/scala/special/collection/Colls.scala b/common/shared/src/main/scala/special/collection/Colls.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/collection/Colls.scala rename to common/shared/src/main/scala/special/collection/Colls.scala diff --git a/core-lib/shared/src/main/scala/special/collection/CollsOverArrays.scala b/common/shared/src/main/scala/special/collection/CollsOverArrays.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/collection/CollsOverArrays.scala rename to common/shared/src/main/scala/special/collection/CollsOverArrays.scala diff --git a/core-lib/shared/src/main/scala/special/collection/Extensions.scala b/common/shared/src/main/scala/special/collection/Extensions.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/collection/Extensions.scala rename to common/shared/src/main/scala/special/collection/Extensions.scala diff --git a/core-lib/shared/src/main/scala/special/collection/Helpers.scala b/common/shared/src/main/scala/special/collection/Helpers.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/collection/Helpers.scala rename to common/shared/src/main/scala/special/collection/Helpers.scala diff --git a/core-lib/shared/src/main/scala/special/collection/package.scala b/common/shared/src/main/scala/special/collection/package.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/collection/package.scala rename to common/shared/src/main/scala/special/collection/package.scala diff --git a/core-lib/shared/src/main/scala/special/sigma/SigmaDsl.scala b/common/shared/src/main/scala/special/sigma/SigmaDsl.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/sigma/SigmaDsl.scala rename to common/shared/src/main/scala/special/sigma/SigmaDsl.scala diff --git a/core-lib/shared/src/main/scala/special/sigma/package.scala b/common/shared/src/main/scala/special/sigma/package.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/sigma/package.scala rename to common/shared/src/main/scala/special/sigma/package.scala diff --git a/core-lib/shared/src/main/scala/special/wrappers/WrappersSpec.scala b/common/shared/src/main/scala/special/wrappers/WrappersSpec.scala similarity index 100% rename from core-lib/shared/src/main/scala/special/wrappers/WrappersSpec.scala rename to common/shared/src/main/scala/special/wrappers/WrappersSpec.scala diff --git a/core-lib/shared/src/test/scala/special/TypesTests.scala b/common/shared/src/test/scala/special/TypesTests.scala similarity index 100% rename from core-lib/shared/src/test/scala/special/TypesTests.scala rename to common/shared/src/test/scala/special/TypesTests.scala diff --git a/core-lib/shared/src/test/scala/special/collections/CollGens.scala b/common/shared/src/test/scala/special/collections/CollGens.scala similarity index 100% rename from core-lib/shared/src/test/scala/special/collections/CollGens.scala rename to common/shared/src/test/scala/special/collections/CollGens.scala diff --git a/core-lib/shared/src/test/scala/special/collections/CollsTests.scala b/common/shared/src/test/scala/special/collections/CollsTests.scala similarity index 100% rename from core-lib/shared/src/test/scala/special/collections/CollsTests.scala rename to common/shared/src/test/scala/special/collections/CollsTests.scala