Skip to content

Commit

Permalink
Merge pull request #223 from armanbilge/update/munit-1.0.0-M5
Browse files Browse the repository at this point in the history
Upgrade to MUnit 1.0.0-M6
  • Loading branch information
armanbilge authored Aug 2, 2022
2 parents 40e4428 + 146426a commit f7d4c2b
Show file tree
Hide file tree
Showing 25 changed files with 248 additions and 553 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,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 ce2/jvm/target .js/target site/target ce3/js/target .jvm/target .native/target ce2/js/target ce3/jvm/target project/target
run: mkdir -p target .js/target site/target core/.js/target core/.jvm/target .jvm/target .native/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 ce2/jvm/target .js/target site/target ce3/js/target .jvm/target .native/target ce2/js/target ce3/jvm/target project/target
run: tar cf targets.tar target .js/target site/target core/.js/target core/.jvm/target .jvm/target .native/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
71 changes: 9 additions & 62 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,77 +1,24 @@
ThisBuild / tlBaseVersion := "1.0"
ThisBuild / tlBaseVersion := "2.0"

ThisBuild / developers += tlGitHubDev("milanvdm", "Milan van der Meer")
ThisBuild / startYear := Some(2021)

ThisBuild / crossScalaVersions := List("3.1.3", "2.12.16", "2.13.8")

ThisBuild / tlFatalWarningsInCi := false

lazy val docs = project
.in(file("site"))
.dependsOn(ce3.jvm)
.dependsOn(core.jvm)
.enablePlugins(TypelevelSitePlugin)

lazy val root = tlCrossRootProject.aggregate(ce3, ce2)
lazy val root = tlCrossRootProject.aggregate(core)

lazy val ce3 = crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Full)
.settings(
name := "munit-cats-effect-3",
Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/main/scala",
Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/test/scala"
)
lazy val core = crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Pure)
.in(file("core"))
.settings(
name := "munit-cats-effect",
libraryDependencies ++= Seq(
"org.scalameta" %%% "munit" % "0.7.29",
"org.scalameta" %%% "munit" % "1.0.0-M6",
"org.typelevel" %%% "cats-effect" % "3.3.14"
),
// we are checking binary compatibility from the 1.0.6 version
mimaPreviousArtifacts ~= {
_.filter { m =>
VersionNumber(m.revision).matchesSemVer(SemanticSelector(">=1.0.6"))
}
}
)
.jvmSettings(
Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/main/scala",
Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/test/scala"
)
.jsSettings(
Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/main/scala",
Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/test/scala",
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
)

lazy val ce2 = crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Full)
.settings(
name := "munit-cats-effect-2",
Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/main/scala",
Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/test/scala"
)
.settings(
libraryDependencies ++= Seq(
"org.scalameta" %%% "munit" % "0.7.29",
"org.typelevel" %%% "cats-effect" % "2.5.5"
),
// we are checking binary compatibility from the 1.0.6 version
mimaPreviousArtifacts ~= {
_.filter { m =>
VersionNumber(m.revision).matchesSemVer(SemanticSelector(">=1.0.6"))
}
}
)
)
.jvmSettings(
Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/main/scala",
Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/test/scala"
)
.jsSettings(
libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0",
Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/main/scala",
Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/test/scala",
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
)

addCommandAlias("fmt", """scalafmtSbt;scalafmtAll""")
addCommandAlias("fmtCheck", """scalafmtSbtCheck;scalafmtCheckAll""")
30 changes: 0 additions & 30 deletions ce2/js/src/main/scala/munit/CatsEffectSuitePlatform.scala

This file was deleted.

32 changes: 0 additions & 32 deletions ce2/jvm/src/main/scala/munit/CatsEffectSuitePlatform.scala

This file was deleted.

57 changes: 0 additions & 57 deletions ce2/shared/src/main/scala/munit/CatsEffectSuite.scala

This file was deleted.

25 changes: 0 additions & 25 deletions ce3/js/src/main/scala/munit/CatsEffectSuitePlatform.scala

This file was deleted.

28 changes: 0 additions & 28 deletions ce3/jvm/src/main/scala/munit/CatsEffectSuitePlatform.scala

This file was deleted.

19 changes: 0 additions & 19 deletions common/js/src/main/scala/munit/CatsEffectFixturesPlatform.scala

This file was deleted.

51 changes: 0 additions & 51 deletions common/jvm/src/main/scala/munit/CatsEffectFixturesPlatform.scala

This file was deleted.

Loading

0 comments on commit f7d4c2b

Please sign in to comment.