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

Jump to bottom

Update scala-library to 2.13.14 #609

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Update scala-library to 2.13.14 #609

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
2093853
Update scala-library to 2.13.14
typelevel-steward[bot] May 2, 2024
0d88951
fixes for breaking changes of Xsource:3 in 2.13.14
jenshalm Jul 5, 2024
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
4 changes: 4 additions & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ inThisBuild(
)
)

def inferOverrideFor2_13(version: String): Seq[String] =
if (version.startsWith("2.13")) Seq("-Xsource-features:infer-override") else Nil

def disableMissingInterpolatorWarning(options: Seq[String]): Seq[String] =
options.map { opt =>
if (opt.startsWith("-Xlint")) opt + ",-missing-interpolator" else opt
Expand Down Expand Up @@ -134,6 +137,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
"org.scalameta" %%% "munit" % versions.munit % "test",
"org.typelevel" %%% "cats-core" % versions.catsCore
),
scalacOptions ++= inferOverrideFor2_13(scalaVersion.value),
Test / scalacOptions ~= disableMissingInterpolatorWarning
)
.jvmSettings(
Expand Down
6 changes: 3 additions & 3 deletions core/shared/src/main/scala/laika/internal/parse/hocon/ConfigResolver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ private[laika] object ConfigResolver {
obj.values.groupBy(_.key.getOrElse(Key.root)).mapValuesStrict(_.map(_.value)).toSeq.map {
case (key, values) =>
val merged = values.reduce(mergeValues(key)) match {
case obj: ObjectBuilderValue => mergeObjects(obj)
case obv: ObjectBuilderValue => mergeObjects(obv)
case other => other
}
BuilderField(key, merged)
Expand Down Expand Up @@ -373,8 +373,8 @@ private[laika] object ConfigResolver {
extract(field + "." + index, arrValue)
}
if (nested.isEmpty) wrap(failure) else nested
case InvalidBuilderValue(obj: ObjectBuilderValue, failure) =>
val nested = extractErrors(obj)
case InvalidBuilderValue(obv: ObjectBuilderValue, failure) =>
val nested = extractErrors(obv)
if (nested.isEmpty) wrap(failure) else nested
case InvalidBuilderValue(_, failure) => wrap(failure)
case incl: IncludeBuilderValue =>
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ object Dependencies {
object versions {

val scala2_12 = "2.12.19"
val scala2_13 = "2.13.12"
val scala2_13 = "2.13.14"
val scala3 = "3.3.3"

val catsCore = "2.10.0"
Expand Down
Loading