Merge pull request #36 from cb372/improve-scripted-tests

Improve scripted tests
cb372 · Aug 17, 2019 · 8ea330f · 8ea330f
2 parents a7b5a95 + 295e3b3
commit 8ea330f
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 14 deletions.
diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ import ReleaseTransformations._
 enablePlugins(SbtPlugin)
 crossSbtVersions := Seq("0.13.18", "1.2.8")
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.12.9"
 organization := "com.github.cb372"
 description := "An sbt plugin to check that your project does not directly depend on any transitive dependencies for compilation"
 licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))
@@ -44,5 +44,10 @@ updateVersionInExampleProject := {
   scala.sys.process.Process(gitCommand).!
 }
 
-scriptedLaunchOpts := scriptedLaunchOpts.value ++ Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
+scriptedLaunchOpts ++= Seq(
+  "-Xmx1024M",
+  "-Dplugin.version=" + version.value,
+  "-Dscala.version=2.12.9",
+  s"-Dsbt.boot.directory=${file(sys.props("user.home")) / ".sbt" / "boot"}"
+)
 scriptedBufferLog := false
diff --git a/src/sbt-test/basic/compiler-plugin-cross-build/build.sbt b/src/sbt-test/basic/compiler-plugin-cross-build/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 crossScalaVersions := Seq("2.11.12", scalaVersion.value)
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "1.4.0"

diff --git a/src/sbt-test/basic/compiler-plugin/build.sbt b/src/sbt-test/basic/compiler-plugin/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "1.4.0"
 )

diff --git a/src/sbt-test/basic/coursier/build.sbt b/src/sbt-test/basic/coursier/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-free" % "1.4.0",
   "org.scalaz" %% "scalaz" % "7.2.26"

diff --git a/src/sbt-test/basic/cross-build/build.sbt b/src/sbt-test/basic/cross-build/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 crossScalaVersions := Seq("2.11.12", scalaVersion.value)
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-free" % "1.4.0",

diff --git a/src/sbt-test/basic/no-unused-no-undeclared-classifier/build.sbt b/src/sbt-test/basic/no-unused-no-undeclared-classifier/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "software.amazon.cryptools" % "AmazonCorrettoCryptoProvider" % "1.1.0" classifier "linux-x86_64"
 )
diff --git a/src/sbt-test/basic/no-unused-no-undeclared-provided/build.sbt b/src/sbt-test/basic/no-unused-no-undeclared-provided/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "1.4.0" % Provided
 )
diff --git a/src/sbt-test/basic/no-unused-no-undeclared/build.sbt b/src/sbt-test/basic/no-unused-no-undeclared/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "1.4.0"
 )
diff --git a/src/sbt-test/basic/undeclared-dependency-filter/build.sbt b/src/sbt-test/basic/undeclared-dependency-filter/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-free" % "1.4.0"
 )

diff --git a/src/sbt-test/basic/undeclared-dependency/build.sbt b/src/sbt-test/basic/undeclared-dependency/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-free" % "1.4.0"
 )
diff --git a/src/sbt-test/basic/unused-dependency-filter/build.sbt b/src/sbt-test/basic/unused-dependency-filter/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "1.4.0",
   "org.scalaz" %% "scalaz" % "7.2.26"

diff --git a/src/sbt-test/basic/unused-dependency-java-library/build.sbt b/src/sbt-test/basic/unused-dependency-java-library/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "1.4.0",
   "org.slf4j" % "slf4j-api" % "1.7.25"

diff --git a/src/sbt-test/basic/unused-dependency/build.sbt b/src/sbt-test/basic/unused-dependency/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.12.8"
+scalaVersion := sys.props("scala.version")
 libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "1.4.0",
   "org.scalaz" %% "scalaz" % "7.2.26"