Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade scala-parser-combinators and scala-xml #439

Merged
merged 2 commits into from
Sep 1, 2021
Merged

Downgrade scala-parser-combinators and scala-xml #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb76f47
Downgrade scala-parser-combinators and scala-xml
mkurz Aug 31, 2021
0ad4b8f
Pin scala-xml and scala-parser-combinators to 1.x
mkurz Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .scala-steward.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
pullRequests.frequency = "@weekly"
commits.message = "${artifactName} ${nextVersion} (was ${currentVersion})"

updates.pin = [
// See comment in build.sbt why we want to pin these two deps to 1.x
{ groupId = "org.scala-lang.modules", artifactId = "scala-xml", version = "1." },
{ groupId = "org.scala-lang.modules", artifactId = "scala-parser-combinators", version = "1." }
]
14 changes: 8 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ import org.scalajs.jsenv.nodejs.NodeJSEnv
// Binary compatibility is this version
val previousVersion: Option[String] = Some("1.5.0")

val ScalaTestVersion = "3.2.9"
val ScalaParserCombinatorsVersion = "2.0.0"

val ScalaXmlVersion = "2.0.1"
// Next line can be removed when dropping Scala 2.12? See https://github.com/playframework/twirl/pull/424
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
val ScalaTestVersion = "3.2.9"

// Do NOT upgrade these dependencies to 2.x or newer! twirl is a sbt-plugin
// and gets published with Scala 2.12, therefore we need to stay at the same major version
// like the 2.12.x Scala compiler, otherwise we run into conflicts when using sbt 1.5+
// See https://github.com/scala/scala/pull/9743
val ScalaParserCombinatorsVersion = "1.1.2" // Do not upgrade beyond 1.x
val ScalaXmlVersion = "1.3.0" // Do not upgrade beyond 1.x

val mimaSettings = Seq(
mimaPreviousArtifacts := previousVersion.map(organization.value %% name.value % _).toSet
Expand Down
3 changes: 0 additions & 3 deletions docs/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true)
addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.8.0"))
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")

// Next line can be removed when dropping Scala 2.12? See https://github.com/playframework/twirl/pull/424
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
3 changes: 0 additions & 3 deletions sbt-twirl/src/sbt-test/twirl/compile/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % sys.props("project.version"))

// Next line can be removed when dropping Scala 2.12? See https://github.com/playframework/twirl/pull/424
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
4 changes: 0 additions & 4 deletions sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % sys.props("project.version"))
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0")

// Next line can be removed when dropping Scala 2.12? See https://github.com/playframework/twirl/pull/424
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always