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

[1.8.x] Scala 2.12.17 #7021

Merged
merged 1 commit into from Sep 17, 2022
Merged

[1.8.x] Scala 2.12.17 #7021

merged 1 commit into from Sep 17, 2022

Conversation

eed3si9n
Copy link
Member

@eed3si9n eed3si9n commented Sep 17, 2022

This bumps up scala-xml to 2.x.

Fixes #6997

@eed3si9n eed3si9n force-pushed the wip/scala branch 8 times, most recently from 88e3a0a to 770a2cf Compare September 17, 2022 07:49
This bumps up scala-xml to 2.x.
@mkurz
Copy link
Member

mkurz commented Sep 22, 2022

Will you backport this for a 1.7.2 release? If not, can you meanwhile release 1.8.0-M1 (or RC1) so we can make use of that?
Also Scala 2.13.9 is released and should be upgraded in sbt.

@eed3si9n
Copy link
Member Author

Due to the eviction error difference, I think we should release it as 1.8.0-M1.

@tOverney
Copy link

Is it possible to get a version published with this change?
To get Scoverage to work for 2.13.9 we need the new version of sbt-scoverage but that one already pulls scala-xml 2.1.x
and thus it's the eviction warning festival :)

@mkurz
Copy link
Member

mkurz commented Sep 27, 2022

+1 At least 1.8.0-M1 would be nice.

BTW: @tOverney Take care with Scala 2.13.9, there is a bug that can bite you, at least when not using MiMa, see scala/bug#12650

@mkurz
Copy link
Member

mkurz commented Oct 31, 2022

sbt 1.7.3 now pulls in Scala 2.12.17, see playframework/playframework#11522

@eed3si9n
Copy link
Member Author

I didn't expect that to happen. As far as I know the scala-compiler dependency is still on 2.12.16 - https://github.com/sbt/sbt/blob/v1.7.3/project/Dependencies.scala#L7

@SethTisue
Copy link
Member

SethTisue commented Oct 31, 2022

Could the cause be coursier/coursier#2548 ?

UPDATE: oh, I see @unkarjedy already suspected that over on the Play ticket. Well, I suspect it too.

@SethTisue
Copy link
Member

sbt 1.7.3 now pulls in Scala 2.12.17,

Are you sure? Are you sure you're not just seeing scala-xml 2.x coming in via coursier/coursier#2548 and #7059 ?

@SethTisue
Copy link
Member

I see there's also discussion at #6997

@mkurz
Copy link
Member

mkurz commented Oct 31, 2022

@SethTisue Yeah sure that's want I meant. However users may don't know internals, so they they see this problem only by bumping 1.7.2 to 1.7.3, that's what I meant.

@eed3si9n eed3si9n changed the title Scala 2.12.17 [1.8.x] Scala 2.12.17 Oct 31, 2022
@@ -102,9 +102,9 @@ object Dependencies {

val scalaXml = Def.setting(
if (scalaBinaryVersion.value == "3") {
"org.scala-lang.modules" %% "scala-xml" % "2.0.1"
"org.scala-lang.modules" %% "scala-xml" % "2.1.0"
Copy link

Choose a reason for hiding this comment

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

Out of curiosity, was it intentional to keep the if statement when both branches return the same value? Or is it a mistake that both return the same?

Copy link
Member Author

Choose a reason for hiding this comment

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

We can get rid of the if expression here.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consider bumping scala-xml to 2.x
5 participants