Skip to content

Commit 1325109

Browse files
committed
Some small scripted tests improvements
Changes: - removed `-XX:MaxPermSize` from `scriptedLaunchOpts` (not used in Java 1.8) - replaced `%%` with `%` in `plugins.sbt` files in all test projects
1 parent 57d3974 commit 1325109

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ publishArtifact in Test := false
1919
ScriptedPlugin.scriptedSettings
2020

2121
scriptedLaunchOpts ++= Seq(
22-
"-Xmx1024M", "-XX:MaxPermSize=256M",
22+
"-Xmx1024M",
2323
"-Dplugin.version=" + version.value
2424
)
2525

src/sbt-test/scoverage/aggregate/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/bad-coverage/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/coverage-off/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/good-coverage/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/preserve-set/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/scalac-plugin-version/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

src/sbt-test/scoverage/scalajs/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ val pluginVersion = sys.props.getOrElse(
44
"""|The system property 'plugin.version' is not defined.
55
|Specify this property using the scriptedLaunchOpts -D.""".stripMargin))
66

7-
addSbtPlugin("org.scoverage" %% "sbt-scoverage" % pluginVersion)
7+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % pluginVersion)
88

99
resolvers ++= {
1010
if (pluginVersion.endsWith("-SNAPSHOT"))

0 commit comments

Comments
 (0)