From dadeaece8cad864015f6c704d310f3afe1679e0d Mon Sep 17 00:00:00 2001 From: Romain Ruetschi <106849+romac@users.noreply.github.com> Date: Mon, 29 Jan 2024 22:23:09 +0100 Subject: [PATCH] Add core as subproject --- .github/workflows/ci.yml | 2 +- build.sbt | 6 +++++- {src => core/src}/main/scala/Backend.scala | 0 {src => core/src}/main/scala/Choreo.scala | 0 {src => core/src}/main/scala/Location.scala | 0 {src => core/src}/main/scala/Network.scala | 0 {src => core/src}/main/scala/Utils.scala | 0 {src => core/src}/test/scala/LocalSuite.scala | 0 8 files changed, 6 insertions(+), 2 deletions(-) rename {src => core/src}/main/scala/Backend.scala (100%) rename {src => core/src}/main/scala/Choreo.scala (100%) rename {src => core/src}/main/scala/Location.scala (100%) rename {src => core/src}/main/scala/Network.scala (100%) rename {src => core/src}/main/scala/Utils.scala (100%) rename {src => core/src}/test/scala/LocalSuite.scala (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6b5734..eb9e5ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: run: sbt '++ ${{ matrix.scala }}' test - name: Compress target directories - run: tar cf targets.tar target examples/target project/target + run: tar cf targets.tar target core/target examples/target project/target - name: Upload target directories uses: actions/upload-artifact@v4 diff --git a/build.sbt b/build.sbt index 45be8d7..18a61d2 100644 --- a/build.sbt +++ b/build.sbt @@ -10,6 +10,10 @@ ThisBuild / scalacOptions ++= Seq("-source", "3.3") lazy val root = project .in(file(".")) + .aggregate(core, examples) + +lazy val core = project + .in(file("core")) .settings( name := "choreo", libraryDependencies ++= Seq( @@ -29,7 +33,7 @@ lazy val examples = project "org.typelevel" %% "cats-effect" % Versions.catsEffect ) ) - .dependsOn(root) + .dependsOn(core) val PrimaryJava = JavaSpec.temurin("8") val LTSJava = JavaSpec.temurin("17") diff --git a/src/main/scala/Backend.scala b/core/src/main/scala/Backend.scala similarity index 100% rename from src/main/scala/Backend.scala rename to core/src/main/scala/Backend.scala diff --git a/src/main/scala/Choreo.scala b/core/src/main/scala/Choreo.scala similarity index 100% rename from src/main/scala/Choreo.scala rename to core/src/main/scala/Choreo.scala diff --git a/src/main/scala/Location.scala b/core/src/main/scala/Location.scala similarity index 100% rename from src/main/scala/Location.scala rename to core/src/main/scala/Location.scala diff --git a/src/main/scala/Network.scala b/core/src/main/scala/Network.scala similarity index 100% rename from src/main/scala/Network.scala rename to core/src/main/scala/Network.scala diff --git a/src/main/scala/Utils.scala b/core/src/main/scala/Utils.scala similarity index 100% rename from src/main/scala/Utils.scala rename to core/src/main/scala/Utils.scala diff --git a/src/test/scala/LocalSuite.scala b/core/src/test/scala/LocalSuite.scala similarity index 100% rename from src/test/scala/LocalSuite.scala rename to core/src/test/scala/LocalSuite.scala