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.

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

Scala 2.13.0 support for 2.0.x #354

Merged
merged 3 commits into from
Jun 15, 2019
Merged

Conversation

htmldoug
Copy link
Contributor

Pull Request Checklist

  • Have you read through the contributor guidelines?
  • Have you signed the Typesafe CLA?
  • Have you squashed your commits?
  • Have you added copyright headers to new files?
  • Have you checked that both Scala and Java APIs are updated?
  • Have you updated the documentation for both Scala and Java sections?
  • Have you added tests for any changed functionality?

Purpose

Adds scala 2.13.0 support on the 2.0.x branch.

References

https://www.scala-lang.org/news/2.13.0

case VersionPattern(epoch, major, minor, _) => (0 until minor.toInt).map(v => s"$epoch.$major.$v")
case _ => sys.error(s"Cannot find previous versions for ${version.value}")
}

val sbv = scalaBinaryVersion.value
if (sbv.equals(scala213)) Set.empty
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this since a comparison like "2.13".equals("2.13.0") would never be true.

@@ -67,13 +67,12 @@ lazy val mimaSettings = mimaDefaultSettings ++ Seq(
mimaPreviousArtifacts := {
val VersionPattern = """^(\d+).(\d+).(\d+)(-.*)?""".r
val previousVersions = version.value match {
case VersionPattern("2", "0", "5", _) if scalaBinaryVersion.value == "2.13" => Set.empty // added 2.13.0 support in 2.0.5-SNAPSHOT.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Best I could come up with. Don't be shy if you know of a better way.

Copy link
Member

@marcospereira marcospereira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @htmldoug.

See the comments. I'm mostly worried about ssl-config, where we made some substantial changes between 0.3.7 and 0.4.0. I will do some investigation to check if it is okay to use it here.

val playJson = Seq("com.typesafe.play" %% "play-json" % playJsonVersion)

val slf4jApi = Seq("org.slf4j" % "slf4j-api" % "1.7.26")

val javaxInject = Seq("javax.inject" % "javax.inject" % "1")

val sslConfigVersion = "0.3.7"
val sslConfigVersion = "0.4.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure 0.4.0 and 0.3.7 are compatible. Maybe we will need to cut a release from 0.3.7 that supports Scala 2.13.

@dwijnand what do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's possible they are, but it's safer to try to crossbuild 0.3.7.

val sslConfigCore = Seq("com.typesafe" %% "ssl-config-core" % sslConfigVersion)

val scalaXmlVersion = "1.1.1"
val scalaXmlVersion = "1.2.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is scala-xml 1.2.0 binary compatible with 1.1.1? If not, then the best option is to add distinct versions depending on the Scala version used.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/scala/scala-xml/releases/tag/v1.2.0

This release is not backwards compatible with the last release of scala-xml, 1.1.1, because of the small change that removes the name field from transform.RewriteRule, see #129. It appears to have been an unused vestigial class member in a rarely used class, so it's likely of low risk.

@mergify mergify bot merged commit 72eb983 into playframework:2.0.x Jun 15, 2019
@htmldoug
Copy link
Contributor Author

Thanks for the updates and merge!

mergify bot added a commit that referenced this pull request Jun 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants