luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump classloader-cache test to scala 2.12.8 

These were written before we upgraded scala in the develop branch. I'm
not doing this as a fixup to keep the PR clean.
This commit is contained in:
Ethan Atkins 2019-01-29 11:43:32 -08:00
parent 3a211710f9
commit 0fb60733cd
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbt/src/sbt-test/classloader-cache/akka-actor-system/build.sbt
View File

@ -1,6 +1,6 @@
val akkaTest = (project in file(".")).settings( val akkaTest = (project in file(".")).settings(
name := "akka-test", name := "akka-test",
scalaVersion := "2.12.7", scalaVersion := "2.12.8",
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.5.16", "com.typesafe.akka" %% "akka-actor" % "2.5.16",
"com.lihaoyi" %% "utest" % "0.6.6" % "test" "com.lihaoyi" %% "utest" % "0.6.6" % "test"

2
sbt/src/sbt-test/classloader-cache/jni/build.sbt
View File

@ -11,7 +11,7 @@ def wrap(task: InputKey[Unit]): Def.Initialize[Task[Unit]] =
Def.sequential(appendToLibraryPath, task.toTask(""), dropLibraryPath) Def.sequential(appendToLibraryPath, task.toTask(""), dropLibraryPath)
val root = (project in file(".")).settings( val root = (project in file(".")).settings(
scalaVersion := "2.12.7", scalaVersion := "2.12.8",
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-h", javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-h",
sourceDirectory.value.toPath.resolve("main/native/include").toString), sourceDirectory.value.toPath.resolve("main/native/include").toString),
libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.6" % "test", libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.6" % "test",

2
sbt/src/sbt-test/classloader-cache/library-mismatch/build.sbt
View File

@ -1,6 +1,6 @@
val snapshot = (project in file(".")).settings( val snapshot = (project in file(".")).settings(
name := "mismatched-libraries", name := "mismatched-libraries",
scalaVersion := "2.12.7", scalaVersion := "2.12.8",
libraryDependencies ++= Seq("com.lihaoyi" %% "utest" % "0.6.6" % "test"), libraryDependencies ++= Seq("com.lihaoyi" %% "utest" % "0.6.6" % "test"),
testFrameworks := Seq(TestFramework("utest.runner.Framework")), testFrameworks := Seq(TestFramework("utest.runner.Framework")),
resolvers += "Local Maven" at file("libraries/ivy").toURI.toURL.toString, resolvers += "Local Maven" at file("libraries/ivy").toURI.toURL.toString,

2
sbt/src/sbt-test/classloader-cache/snapshot/build.sbt
View File

@ -6,7 +6,7 @@ val rewriteIvy = inputKey[Unit]("Rewrite ivy directory")
val snapshot = (project in file(".")).settings( val snapshot = (project in file(".")).settings(
name := "akka-test", name := "akka-test",
scalaVersion := "2.12.7", scalaVersion := "2.12.8",
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.lihaoyi" %% "utest" % "0.6.6" % "test" "com.lihaoyi" %% "utest" % "0.6.6" % "test"
), ),

2
sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-1/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
View File

@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId> <artifactId>scala-library</artifactId>
<version>2.12.7</version> <version>2.12.8</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-2/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
View File

@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>org.scala-lang</groupId> <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId> <artifactId>scala-library</artifactId>
<version>2.12.7</version> <version>2.12.8</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
sbt/src/sbt-test/classloader-cache/utest/build.sbt
View File

@ -1,6 +1,6 @@
val utestTest = (project in file(".")).settings( val utestTest = (project in file(".")).settings(
name := "utest-test", name := "utest-test",
scalaVersion := "2.12.7", scalaVersion := "2.12.8",
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.lihaoyi" %% "utest" % "0.6.6" % "test" "com.lihaoyi" %% "utest" % "0.6.6" % "test"
), ),