Skip to content

Commit

Permalink
Merge pull request #1149 from eed3si9n/wip/bump
Browse files Browse the repository at this point in the history
Bump scala-xml and util
  • Loading branch information
eed3si9n authored Nov 10, 2022
2 parents 7d91a69 + 41d639c commit 48b2fc6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
5 changes: 4 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,10 @@ lazy val zincPersist = (projectMatrix in internalPath / "zinc-persist")
.dependsOn(zincCore, zincCompileCore, zincPersistCoreAssembly, zincCore % "test->test")
.settings(
name := "zinc Persist",
libraryDependencies += sbinary,
libraryDependencies ++= Seq(
sbinary.exclude("org.scala-lang.modules", "scala-xml_" + scalaBinaryVersion.value),
scalaXml
),
compileOrder := sbt.CompileOrder.Mixed,
Compile / scalacOptions ++= (scalaVersion.value match {
case VersionNumber(Seq(2, 12, _*), _, _) =>
Expand Down
7 changes: 4 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ object Dependencies {

val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.16"
val scala212 = "2.12.17"
val scala213 = "2.13.8"
val defaultScalaVersion = scala212
val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213)
val scala212_213 = Seq(defaultScalaVersion, scala213)

private val ioVersion = nightlyVersion.getOrElse("1.7.0")
private val utilVersion = nightlyVersion.getOrElse("1.7.2")
private val ioVersion = nightlyVersion.getOrElse("1.8.0")
private val utilVersion = nightlyVersion.getOrElse("1.8.0")

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

Expand Down Expand Up @@ -72,6 +72,7 @@ object Dependencies {

val parserCombinator = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2"
val sbinary = "org.scala-sbt" %% "sbinary" % "0.5.1"
val scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.17.0"
val scalatest = "org.scalatest" %% "scalatest" % "3.2.13"
val verify = "com.eed3si9n.verify" %% "verify" % "2.0.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"projects": [
{
"name": "mirtest",
"scalaVersion": "2.12.16"
"scalaVersion": "2.12.17"
}
]
}

0 comments on commit 48b2fc6

Please sign in to comment.