Skip to content

In Scala 2 keep using scala-parser-combinators 1.x (Scala 3: 2.x)#772

Merged
eed3si9n merged 4 commits intofoundweekends:developfrom
mkurz:revert_3e9a9319
Mar 3, 2023
Merged

In Scala 2 keep using scala-parser-combinators 1.x (Scala 3: 2.x)#772
eed3si9n merged 4 commits intofoundweekends:developfrom
mkurz:revert_3e9a9319

Conversation

@mkurz
Copy link
Copy Markdown
Contributor

@mkurz mkurz commented Mar 3, 2023

Downgrading again like we did in #725 already. Scala 2.12.17 still uses scala-parser-combinators 1.x, also sbt-native packager and many other sbt-plugins still do. #764 should not have been merged...

Only in Scala 3 we should start using scala-parser-combinators 2.x.

scalamock % Test,
"org.slf4j" % "slf4j-simple" % "1.7.36" % Test
) ++
(CrossVersion.partialVersion(scalaVersion.value) match {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We don't need to care about Scala 2.11 anymore, was dropped in #428

def parserCombinator(scalaVersion: String) = "org.scala-lang.modules" %% "scala-parser-combinators" % {
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, _)) => "1.1.2" // Do not upgrade beyond 1.x
case _ => "2.2.0"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Scala 2 always keep using 1.x, when cross compiling to Scala 3 in future it can use 2.x.

@mkurz
Copy link
Copy Markdown
Contributor Author

mkurz commented Mar 3, 2023

Not sure why tests are not running...

@mkurz mkurz closed this Mar 3, 2023
@mkurz mkurz reopened this Mar 3, 2023
Copy link
Copy Markdown
Member

@eed3si9n eed3si9n left a comment

Choose a reason for hiding this comment

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

Thanks!

@eed3si9n eed3si9n enabled auto-merge March 3, 2023 13:17
@eed3si9n eed3si9n merged commit fada1ff into foundweekends:develop Mar 3, 2023
@mkurz mkurz deleted the revert_3e9a9319 branch March 3, 2023 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants