-
Notifications
You must be signed in to change notification settings - Fork 86
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
Conversation
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 |
There was a problem hiding this comment.
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. |
There was a problem hiding this comment.
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.
There was a problem hiding this 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.
project/Dependencies.scala
Outdated
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" |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
project/Dependencies.scala
Outdated
val sslConfigCore = Seq("com.typesafe" %% "ssl-config-core" % sslConfigVersion) | ||
|
||
val scalaXmlVersion = "1.1.1" | ||
val scalaXmlVersion = "1.2.0" |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
Thanks for the updates and merge! |
Updates - Scala 2.13 & Akka 2.6.0-M3 (bp #354)
Pull Request Checklist
Purpose
Adds scala 2.13.0 support on the 2.0.x branch.
References
https://www.scala-lang.org/news/2.13.0