Merge pull request #113 from eed3si9n/wip/bump

Update Coursier to 2.1.0-RC1
twitter · Nov 10, 2022 · bf29039 · bf29039
2 parents e1a00e3 + 4c994c9
commit bf29039
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
 lazy val V = new {
-  def scala212 = "2.12.12"
+  def scala212 = "2.12.17"
   def moped = "0.1.9"
 }
 
@@ -70,7 +70,7 @@ lazy val multiversion = project
       baseDirectory.in(ThisBuild).value / "multiversion-example"
     },
     libraryDependencies ++= List(
-      "io.get-coursier" %% "coursier" % "2.0.0",
+      "io.get-coursier" %% "coursier" % "2.1.0-RC1",
       "io.get-coursier" %% "versions" % "0.3.1",
       "org.scalameta" %% "moped" % V.moped,
       "org.scalameta" %% "moped-yaml" % V.moped,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,7 +4,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
 addSbtPlugin("org.scalameta" % "sbt-native-image" % "0.2.1")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.2")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.19")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
diff --git a/tests/src/test/scala/tests/commands/ExportCommandSuite.scala b/tests/src/test/scala/tests/commands/ExportCommandSuite.scala
@@ -616,10 +616,10 @@ class ExportCommandSuite extends tests.BaseSuite with tests.ConfigSyntax {
     ),
     expectedExit = 1,
     expectedOutput =
-      """|/workingDirectory/3rdparty.yaml:15:16 error: Within 'broken-target', the module 'com.google.guava:guava' is resolved multiple times with incompatible versions 16.0.1, 30.1.1-jre.
+      """|/workingDirectory/3rdparty.yaml:3:16 error: Within 'broken-target', the module 'com.google.guava:guava' is resolved multiple times with incompatible versions 16.0.1, 30.1.1-jre.
          |To fix this problem, update your dependencies to compatible versions, or add exclusion rules to force compatible versions of 'com.google.guava:guava'.
          |
-         |  - dependency: com.google.inject:guice:4.0
+         |  - dependency: com.google.auto:auto-common:1.0
          |                ^""".stripMargin
   )