Skip to content

Commit

Permalink
Update example projects
Browse files Browse the repository at this point in the history
  • Loading branch information
eed3si9n committed Jul 27, 2024
1 parent e281f0d commit 4cb8737
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 27 deletions.
16 changes: 4 additions & 12 deletions examples/multi-project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,28 +1,20 @@


lazy val commonSettings = Seq(
libraryDependencies ++= Seq(
"com.github.sbt.jupiter" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test
)
ThisBuild / scalaVersion := "2.12.19"
ThisBuild / libraryDependencies ++= Seq(
"com.github.sbt.junit" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test
)

lazy val moduleA = project.in(file("moduleA"))
.enablePlugins(JvmPlugin)
.settings(commonSettings)
.settings(
name := "moduleA"
)

lazy val moduleB = project.in(file("moduleB"))
.enablePlugins(JvmPlugin)
.settings(commonSettings)
.settings(
name := "moduleB"
)

lazy val root = project.in(file("."))
.settings(commonSettings)
.aggregate(moduleA, moduleB)
.settings(
name := "multi-project"
)
.aggregate(moduleA, moduleB)
2 changes: 1 addition & 1 deletion examples/multi-project/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.9
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion examples/multi-project/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.10.0")
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.11.3")
5 changes: 2 additions & 3 deletions examples/simple/build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

scalaVersion := "2.12.19"
name := "simple"

libraryDependencies ++= Seq(
"com.github.sbt.junit" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test
)
)
2 changes: 1 addition & 1 deletion examples/simple/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.9
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion examples/simple/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.10.0")
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.11.3")
2 changes: 1 addition & 1 deletion test-project/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ lazy val jupiter = (project in file("src/jupiter"))
"org.junit.jupiter" % "junit-jupiter-params" % junitJupiterVersion.value % "test"
),
resolvers += Resolver.mavenLocal,
parallelExecution in Test := true
Test / parallelExecution := true
)

lazy val vintage = (project in file("src/vintage"))
Expand Down
2 changes: 1 addition & 1 deletion test-project/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.3
sbt.version=1.10.1
7 changes: 1 addition & 6 deletions test-project/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
lazy val pluginVersion = IO.readLines(file("../version.sbt"))
.filter(_.startsWith("version in ThisBuild"))
.map(line => line.substring(line.indexOf('"')+1, line.lastIndexOf('"')))
.head

addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % pluginVersion)
addSbtPlugin("com.github.sbt.junit" % "sbt-jupiter-interface" % "0.11.3")

0 comments on commit 4cb8737

Please sign in to comment.