Skip to content

Commit

Permalink
collection-compat 2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
raboof committed Jul 12, 2021
1 parent ba5f8d3 commit 4986ebb
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ object Dependencies {
val protocJar = "com.github.os72" % "protoc-jar" % "3.11.4"

val plexusBuildApi = "org.sonatype.plexus" % "plexus-build-api" % "0.0.7" % "optional" // Apache v2
val collectionCompat = "org.scala-lang.modules" %% "scala-collection-compat" % "2.5.0"
}

object Test {
Expand All @@ -84,7 +85,13 @@ object Dependencies {

private val l = libraryDependencies

val codegen = l ++= Seq(Compile.scalapbCompilerPlugin, Test.scalaTest)
val codegen = l ++= Seq(
Compile.scalapbCompilerPlugin,
// Temporarily added: this is a transitive
// dependency, but we want to pull it up to
// at least version 2.5.0
Compile.collectionCompat,
Test.scalaTest)

val runtime = l ++= Seq(
Compile.scalapbRuntime,
Expand All @@ -96,6 +103,10 @@ object Dependencies {
Compile.akkaHttp,
Compile.akkaDiscovery,
Compile.akkaHttpCors % "provided",
// Temporarily added: this is a transitive
// dependency, but we want to pull it up to
// at least version 2.5.0
Compile.collectionCompat,
Test.akkaDiscoveryConfig,
Test.akkaTestkit,
Test.scalaTest,
Expand Down

0 comments on commit 4986ebb

Please sign in to comment.