Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

avoid old scala versions in test #232

Merged
merged 1 commit into from
Jan 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/sbt-test/caching/caching/build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
lazy val root = (project in file(".")).
settings(
version := "0.1",
scalaVersion := "2.9.1",
libraryDependencies += "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test",
libraryDependencies += "com.weiglewilczek.slf4s" %% "slf4s" % "1.0.7",
scalaVersion := "2.11.8",
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test",
libraryDependencies += "ch.qos.logback" % "logback-classic" % "0.9.29" % "runtime",
assemblyOption in assembly := (assemblyOption in assembly).value.copy(cacheOutput = true),
assemblyOption in assembly := (assemblyOption in assembly).value.copy(cacheUnzip = true),
Expand Down
6 changes: 3 additions & 3 deletions src/sbt-test/caching/caching/test
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# check if the file gets created
> clean
> assembly
$ exists target/scala-2.9.1/foo.jar
$ exists target/scala-2.11/foo.jar

# run to cache the hash, then check it's consistent
> check
> checkhash
$ exists target/scala-2.9.1/jarHash.txt
$ exists target/scala-2.11/jarHash.txt
> checkhash

> assembly
Expand All @@ -16,7 +16,7 @@ $ exists target/scala-2.9.1/jarHash.txt
# when the unzipped jars are read from cache
# on disk
> checkhash
$ newer target/scala-2.9.1/jarHash.txt target/scala-2.9.1/foo.jar
$ newer target/scala-2.11/jarHash.txt target/scala-2.11/foo.jar

# generate file
> genresource
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/merging/merging/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val testmerge = (project in file(".")).
settings(
version := "0.1",
assemblyJarName in assembly := "foo.jar",
scalaVersion := "2.9.1",
scalaVersion := "2.11.8",
mergeStrategy in assembly := {
case "a" ⇒ MergeStrategy.concat
case "b" ⇒ MergeStrategy.first
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/merging/merging/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# check if the file gets created
> assembly
$ exists target/scala-2.9.1/foo.jar
$ exists target/scala-2.11/foo.jar

# check if it says hello
> check
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-assembly/config/build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
lazy val root = (project in file(".")).
settings(
version := "0.1",
scalaVersion := "2.9.1"
scalaVersion := "2.11.8"
).
settings(inConfig(Test)(baseAssemblySettings): _*).
settings(
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-assembly/config/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# check if the file gets created
> test:assembly
$ exists target/scala-2.9.1/foo.jar
$ exists target/scala-2.11/foo.jar

# check if it says hello
> check
5 changes: 2 additions & 3 deletions src/sbt-test/sbt-assembly/deps/build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
lazy val root = (project in file(".")).
settings(
version := "0.1",
scalaVersion := "2.9.1",
libraryDependencies += "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test",
libraryDependencies += "com.weiglewilczek.slf4s" %% "slf4s" % "1.0.7",
scalaVersion := "2.11.8",
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test",
libraryDependencies += "ch.qos.logback" % "logback-classic" % "0.9.29" % "runtime",
unmanagedJars in Compile <++= baseDirectory map { base =>
(base / "lib" / "compile" ** "*.jar").classpath
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-assembly/deps/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# check if the file gets created
> assembly
$ exists target/scala-2.9.1/foo.jar
$ exists target/scala-2.11/foo.jar

# check if it says hello
> check
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Builds extends Build {
lazy val commonSettings = Seq(
version := "0.1-SNAPSHOT",
organization := "com.example",
scalaVersion := "2.10.1"
scalaVersion := "2.11.8"
)

lazy val app = (project in file("app")).
Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/shading/keeponly/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val testkeep = (project in file(".")).
settings(
version := "0.1",
assemblyJarName in assembly := "foo.jar",
scalaVersion := "2.9.1",
scalaVersion := "2.11.8",
assemblyShadeRules in assembly := Seq(
ShadeRule.keep("keep.**").inProject
),
Expand Down
4 changes: 2 additions & 2 deletions src/sbt-test/shading/keeponly/test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# check if the file gets created
> assembly
$ exists target/scala-2.9.1/foo.jar
$ exists target/scala-2.11/foo.jar

# check if it says hello
> check
> check