Skip to content

Commit 29ff577

Browse files
marcospereiraoctonato
authored andcommitted
Scala 2.13.0-RC2 (slick#2040)
* Scala 2.13.0-RC2 * Update scalatest version in samples
1 parent 8f61675 commit 29ff577

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ addons:
2727
scala:
2828
- 2.11.12
2929
- 2.12.8
30-
- 2.13.0-RC1
30+
- 2.13.0-RC2
3131
script:
3232
- admin/build.sh
3333
cache:

project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ object Dependencies {
66
// NOTE: remember to change the version numbers in the sample projects
77
// when changing them here
88

9-
val scalaVersions = Seq("2.11.12", "2.12.8", "2.13.0-RC1") // When updating these also update .travis.yml and appveyor.yml
9+
val scalaVersions = Seq("2.11.12", "2.12.8", "2.13.0-RC2") // When updating these also update .travis.yml and appveyor.yml
1010

1111
val slf4j = "org.slf4j" % "slf4j-api" % "1.7.26"
1212
val typesafeConfig = "com.typesafe" % "config" % "1.3.4"
1313
val reactiveStreamsVersion = "1.0.2"
1414
val reactiveStreams = "org.reactivestreams" % "reactive-streams" % reactiveStreamsVersion
1515
val reactiveStreamsTCK = "org.reactivestreams" % "reactive-streams-tck" % reactiveStreamsVersion
16-
val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "1.0.0"
16+
val scalaCollectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.0.0"
1717

1818
def mainDependencies = Seq(slf4j, typesafeConfig, reactiveStreams, scalaCollectionCompat)
1919

@@ -22,7 +22,7 @@ object Dependencies {
2222
"com.novocode" % "junit-interface" % "0.11"
2323
)
2424
def scalaTestFor(scalaVersion: String) = {
25-
val v = "3.0.8-RC2"
25+
val v = "3.0.8-RC4"
2626
"org.scalatest" %% "scalatest" % v
2727
}
2828
val logback = "ch.qos.logback" % "logback-classic" % "1.2.3"

samples/hello-slick/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ libraryDependencies ++= List(
44
"com.typesafe.slick" %% "slick" % "3.3.0",
55
"org.slf4j" % "slf4j-nop" % "1.7.26",
66
"com.h2database" % "h2" % "1.4.199",
7-
"org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test
7+
"org.scalatest" %% "scalatest" % "3.0.8-RC4" % Test
88
)
99

1010
scalacOptions += "-deprecation"

0 commit comments

Comments
 (0)