Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minimise modules and publish them separately (part 1) #912

Merged
merged 30 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
913baec
minimize-modules: core-lib module removed
aslesarenko Aug 21, 2023
83c38cd
minimize-modules: graphir module removed
aslesarenko Aug 21, 2023
cbbd0f3
minimize-modules: move code around
aslesarenko Aug 22, 2023
0e979b6
minimize-modules: move downcastCollType to CollType
aslesarenko Aug 22, 2023
d9638b4
minimize-modules: rename sigmastate -> sigma in common
aslesarenko Aug 22, 2023
9d4d53c
minimize-modules: replaced special.collection -> sigma.collection and…
aslesarenko Aug 22, 2023
3fce4d7
minimize-modules: collections moved to sigma package
aslesarenko Aug 22, 2023
8ed3f81
minimize-modules: use fully qualified java.util.
aslesarenko Aug 22, 2023
55f1c1b
minimize-modules: TupleType moved to separate file
aslesarenko Aug 22, 2023
7f11c9a
minimize-modules: reflection moved to sigma
aslesarenko Aug 22, 2023
a756e43
minimize-modules: util moved to sigma
aslesarenko Aug 22, 2023
3bbc1e4
minimize-modules: move from scalan to sigma.core
aslesarenko Aug 23, 2023
6e7ab0f
minimize-modules: fix packages
aslesarenko Aug 23, 2023
b4e344e
minimize-modules: move from sigmastate.basics -> crypto
aslesarenko Aug 24, 2023
dec171b
minimize-modules: move ExactIntegral, ExactOrdering
aslesarenko Aug 24, 2023
f1d0fc7
minimize-modules: CollType moved
aslesarenko Aug 24, 2023
87682bb
minimize-modules: RType descriptors moved to `sigma` package
aslesarenko Aug 24, 2023
86c83e0
minimize-modules: CollType and TupleType moved to RType.scala
aslesarenko Aug 24, 2023
c5d4022
minimize-modules: CollsTests, CollGens moved to sigma package
aslesarenko Aug 24, 2023
ca26fb4
minimize-modules: renamed package sigma.core -> sigma.data
aslesarenko Aug 25, 2023
ec37de7
minimize-modules: move CollsOverArrays.scala to sigma.data
aslesarenko Aug 25, 2023
fdeda45
minimize-modules: introduced sigma.Colls
aslesarenko Aug 25, 2023
9676d88
minimize-modules: Removed CoreLibReflection.scala
aslesarenko Aug 25, 2023
c01113a
minimize-modules: common module renamed to core
aslesarenko Aug 25, 2023
7d57628
minimize-modules: fix file tests + renamed ReflectionData
aslesarenko Aug 25, 2023
3eba2d1
minimize-modules: AvlTreeVerifier moved out of core
aslesarenko Aug 26, 2023
71e67c4
minimize-modules: RType implicits moved from SType
aslesarenko Aug 26, 2023
e233b14
Merge remote-tracking branch 'origin/todo-v5.x' into minimize-modules
aslesarenko Aug 30, 2023
008d909
minimize-modules: fixes after merge
aslesarenko Aug 30, 2023
a13a03c
minimize-modules: addressed review comments
aslesarenko Sep 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Runs tests and collect coverage
run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} commonJS/test corelibJS/test interpreterJS/test graphirJS/test sdkJS/test scJS/test
run: sbt -jvm-opts ci/ci.jvmopts ++${{ matrix.scala }} coreJS/test interpreterJS/test parsersJS/test sdkJS/test scJS/test

- name: Publish a JVM snapshot ${{ github.ref }}
if: env.HAS_SECRETS == 'true'
Expand Down
61 changes: 10 additions & 51 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,12 @@ lazy val commonDependenies2 = libraryDependencies ++= Seq(

val sigmajsCryptoFacadeVersion = "0.0.7"

lazy val common = crossProject(JVMPlatform, JSPlatform)
.in(file("common"))
lazy val core = crossProject(JVMPlatform, JSPlatform)
.in(file("core"))
.settings(commonSettings ++ testSettings2,
commonDependenies2,
testingDependencies2,
scorexUtilDependency,
publish / skip := true
)
.jvmSettings( crossScalaSettings )
Expand All @@ -209,59 +210,17 @@ lazy val common = crossProject(JVMPlatform, JSPlatform)
),
useYarn := true
)
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 graphir = crossProject(JVMPlatform, JSPlatform)
.in(file("graph-ir"))
.dependsOn(common % allConfigDependency, corelib % allConfigDependency)
.settings(
commonDependenies2,
scryptoDependency,
publish / skip := true
)
.jvmSettings(
crossScalaSettings,
libraryDependencies ++= Seq(scalameter)
)
.jsSettings(
crossScalaSettingsJS,
useYarn := true
)
lazy val graphirJS = graphir.js
lazy val coreJS = core.js
.enablePlugins(ScalaJSBundlerPlugin)

lazy val interpreter = crossProject(JVMPlatform, JSPlatform)
.in(file("interpreter"))
.dependsOn(corelib % allConfigDependency)
.dependsOn(core % allConfigDependency)
.settings(
commonSettings ++ testSettings2,
commonDependenies2,
testingDependencies2,
scorexUtilDependency, fastparseDependency, circeDependency,
scorexUtilDependency, fastparseDependency, circeDependency, scryptoDependency,
publish / skip := true
)
.jvmSettings( crossScalaSettings )
Expand Down Expand Up @@ -319,7 +278,7 @@ lazy val parsersJS = parsers.js

lazy val sdk = crossProject(JVMPlatform, JSPlatform)
.in(file("sdk"))
.dependsOn(corelib % allConfigDependency, interpreter % allConfigDependency, parsers % allConfigDependency)
.dependsOn(core % allConfigDependency, interpreter % allConfigDependency, parsers % allConfigDependency)
.settings(commonSettings ++ testSettings2,
commonDependenies2,
testingDependencies2,
Expand Down Expand Up @@ -351,7 +310,6 @@ lazy val sdkJS = sdk.js
lazy val sc = crossProject(JVMPlatform, JSPlatform)
.in(file("sc"))
.dependsOn(
graphir % allConfigDependency,
interpreter % allConfigDependency,
parsers % allConfigDependency,
sdk % allConfigDependency
Expand All @@ -361,6 +319,7 @@ lazy val sc = crossProject(JVMPlatform, JSPlatform)
commonDependenies2,
testingDependencies2,
scorexUtilDependency, fastparseDependency, circeDependency,
scryptoDependency,
Test / parallelExecution := false
)
.settings(publish / skip := true)
Expand Down Expand Up @@ -396,13 +355,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(core.jvm, interpreter.jvm, parsers.jvm, sdk.jvm, sc.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(core.jvm, interpreter.jvm, parsers.jvm, sdk.jvm, sc.jvm),
inConfigurations(Compile))

lazy val rootSettings = Seq(
Expand Down
140 changes: 0 additions & 140 deletions common/shared/src/main/scala/scalan/TypeDesc.scala

This file was deleted.

26 changes: 0 additions & 26 deletions common/shared/src/main/scala/scalan/package.scala

This file was deleted.

This file was deleted.

Loading
Loading