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 snakeyaml to 1.25 #2987

Merged
merged 2 commits into from
Aug 16, 2019
Merged

Update snakeyaml to 1.25 #2987

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
b1b4f6b
Update snakeyaml to 1.25
scala-steward Aug 14, 2019
7df6bf2
Fix compile error when loading the build
fthomas Aug 14, 2019
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
8 changes: 3 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ crossScalaVersionsFromTravis in Global := {
val manifest = (baseDirectory in ThisBuild).value / ".travis.yml"
import collection.JavaConverters._
Using.fileInputStream(manifest) { fis =>
List(new org.yaml.snakeyaml.Yaml().load(fis))
.collect { case map: java.util.Map[_, _] => map.asScala.toList }
.flatMap(_.collect {
case (k: String, v: String) if k.contains("scala_version_") => v
})
new org.yaml.snakeyaml.Yaml().loadAs(fis, classOf[java.util.Map[_, _]]).asScala.toList.collect {
case (k: String, v: String) if k.contains("scala_version_") => v
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libraryDependencies += "org.yaml" % "snakeyaml" % "1.24"
libraryDependencies += "org.yaml" % "snakeyaml" % "1.25"