Skip to content

Commit 48b2fc6

Browse files
authored
Merge pull request #1149 from eed3si9n/wip/bump
Bump scala-xml and util
2 parents 7d91a69 + 41d639c commit 48b2fc6

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

build.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,10 @@ lazy val zincPersist = (projectMatrix in internalPath / "zinc-persist")
260260
.dependsOn(zincCore, zincCompileCore, zincPersistCoreAssembly, zincCore % "test->test")
261261
.settings(
262262
name := "zinc Persist",
263-
libraryDependencies += sbinary,
263+
libraryDependencies ++= Seq(
264+
sbinary.exclude("org.scala-lang.modules", "scala-xml_" + scalaBinaryVersion.value),
265+
scalaXml
266+
),
264267
compileOrder := sbt.CompileOrder.Mixed,
265268
Compile / scalacOptions ++= (scalaVersion.value match {
266269
case VersionNumber(Seq(2, 12, _*), _, _) =>

project/Dependencies.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ object Dependencies {
77

88
val scala210 = "2.10.7"
99
val scala211 = "2.11.12"
10-
val scala212 = "2.12.16"
10+
val scala212 = "2.12.17"
1111
val scala213 = "2.13.8"
1212
val defaultScalaVersion = scala212
1313
val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213)
1414
val scala212_213 = Seq(defaultScalaVersion, scala213)
1515

16-
private val ioVersion = nightlyVersion.getOrElse("1.7.0")
17-
private val utilVersion = nightlyVersion.getOrElse("1.7.2")
16+
private val ioVersion = nightlyVersion.getOrElse("1.8.0")
17+
private val utilVersion = nightlyVersion.getOrElse("1.8.0")
1818

1919
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
2020

@@ -72,6 +72,7 @@ object Dependencies {
7272

7373
val parserCombinator = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
7474
val sbinary = "org.scala-sbt" %% "sbinary" % "0.5.1"
75+
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
7576
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.0"
7677
val scalatest = "org.scalatest" %% "scalatest" % "3.2.13"
7778
val verify = "com.eed3si9n.verify" %% "verify" % "2.0.1"

zinc/src/sbt-test/source-dependencies/trait-trait-212/build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"projects": [
33
{
44
"name": "mirtest",
5-
"scalaVersion": "2.12.16"
5+
"scalaVersion": "2.12.17"
66
}
77
]
88
}

0 commit comments

Comments
 (0)