Skip to content

Commit

Permalink
Dop deprecated integration configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
RustedBones committed Nov 28, 2023
1 parent 3521df2 commit 2388d7a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ jobs:

- name: Make target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
run: mkdir -p target model/target scodec/target fs2/target project/target
run: mkdir -p target integration/target fs2/target model/target scodec/target project/target

- name: Compress target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
run: tar cf targets.tar target model/target scodec/target fs2/target project/target
run: tar cf targets.tar target integration/target fs2/target model/target scodec/target project/target

- name: Upload target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
Expand Down
34 changes: 22 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,24 @@ ThisBuild / tlSonatypeUseLegacyHost := true
// mima
ThisBuild / mimaBinaryIssueFilters ++= Seq()

lazy val commonSettings = Defaults.itSettings ++
headerSettings(Configurations.IntegrationTest) ++
inConfig(IntegrationTest)(ScalafmtPlugin.scalafmtConfigSettings) ++ Seq(
testFrameworks += new TestFramework("munit.Framework")
)
lazy val commonSettings = Seq(
testFrameworks += new TestFramework("munit.Framework")
)

lazy val noPublishSettings = Seq(
publish / skip := true,
mimaPreviousArtifacts := Set.empty
)

lazy val `taxonomy` = project
.in(file("."))
.settings(commonSettings)
.settings(noPublishSettings)
.aggregate(
`taxonomy-model`,
`taxonomy-scodec`,
`taxonomy-fs2`
)
.settings(
publish / skip := true,
mimaPreviousArtifacts := Set.empty
`taxonomy-fs2`,
integration
)

lazy val `taxonomy-model` = project
Expand All @@ -68,7 +69,6 @@ lazy val `taxonomy-model` = project

lazy val `taxonomy-scodec` = project
.in(file("scodec"))
.configs(IntegrationTest)
.dependsOn(`taxonomy-model`)
.settings(commonSettings)
.settings(
Expand All @@ -80,7 +80,6 @@ lazy val `taxonomy-scodec` = project

lazy val `taxonomy-fs2` = project
.in(file("fs2"))
.configs(IntegrationTest)
.dependsOn(`taxonomy-scodec`)
.settings(commonSettings)
.settings(
Expand All @@ -91,3 +90,14 @@ lazy val `taxonomy-fs2` = project
Dependencies.Test.MUnitCE3
)
)

lazy val integration = project
.in(file("integration"))
.dependsOn(`taxonomy-fs2`)
.settings(commonSettings)
.settings(noPublishSettings)
.settings(
libraryDependencies ++= Seq(
Dependencies.Test.MUnitCE3
)
)
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object Dependencies {
val ScodecCore = "org.scodec" %% "scodec-core" % Versions.Scodec

object Test {
val MUnitCE3 = "org.typelevel" %% "munit-cats-effect-3" % Versions.MUnitCE3 % "it,test"
val MUnitCE3 = "org.typelevel" %% "munit-cats-effect-3" % Versions.MUnitCE3 % "test"
}

}

0 comments on commit 2388d7a

Please sign in to comment.