Skip to content

Commit b080117

Browse files
authored
Merge pull request #32 from sbt/latest_mocha
Latest mocha 10.2.0
2 parents 173dca6 + b8f6849 commit b080117

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

build.sbt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ addSbtJsEngine("1.3.5")
1717

1818
libraryDependencies ++= Seq(
1919
"org.webjars.npm" % "node-require-fallback" % "1.0.0",
20-
"org.webjars" % "mocha" % "1.17.1", // sync with src/main/resources/com/typesafe/sbt/mocha/mocha.js
20+
"org.webjars.npm" % "mocha" % "10.2.0", // sync with src/main/resources/com/typesafe/sbt/mocha/mocha.js
21+
"org.webjars.npm" % "minimatch" % "9.0.3",
2122
)
2223

2324
// Customise sbt-dynver's behaviour to make it work with tags which aren't v-prefixed
@@ -29,3 +30,8 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
2930
dynverAssertTagVersion.value
3031
s
3132
}
33+
34+
scriptedLaunchOpts ++= Seq(
35+
"-Xmx512M",
36+
"-XX:MaxMetaspaceSize=512M",
37+
)

src/main/resources/com/typesafe/sbt/mocha/mocha.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var requireIfExists = require('node-require-fallback');
22

3-
var Mocha = requireIfExists("mocha/1.17.1", "mocha"); // sync with build.sbt
3+
var Mocha = requireIfExists("mocha/10.2.0", "mocha"); // sync with build.sbt
44

55
var mocha = new Mocha();
66

src/sbt-test/sbt-mocha-plugin/test-same-webjars-different-version/project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ addSbtPlugin("com.github.sbt" % "sbt-mocha" % sys.props("project.version"))
1111
// and no subfolder will be forced for that case but the newest version will be choosen. Like normal dependency resolution.
1212
libraryDependencies ++= Seq(
1313
// Pulling in the classic and the npm webjar to subfolders for this webjar will be created
14-
("org.webjars.npm" % "mocha" % "3.0.0-2")
15-
.exclude("org.webjars.npm", "debug")
16-
.exclude("org.webjars.npm", "diff"),
17-
"org.webjars" % "mocha" % "1.17.1",
14+
"org.webjars.npm" % "mocha" % "3.0.0-2",
15+
("org.webjars" % "mocha" % "1.17.1")
16+
.exclude("org.webjars", "debug")
17+
.exclude("org.webjars", "diff"),
1818
)

src/sbt-test/sbt-mocha-plugin/test-same-webjars-different-version/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@
8282
> logged error "Error: Total 9, Failed 1, Errors 1, Passed 7"
8383

8484
$ exists project/target/node-modules/webjars/mocha/1.17.1
85-
$ exists project/target/node-modules/webjars/mocha/3.0.0-2
85+
$ exists project/target/node-modules/webjars/mocha/10.2.0

0 commit comments

Comments
 (0)