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

Updating snakeyaml and removing no longer needed patches #11207

Merged
merged 2 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 1 addition & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,6 @@ lazy val enso = (project in file("."))
`test-utils`,
`text-buffer`,
`version-output`,
yaml,
`ydoc-server`
)
.settings(Global / concurrentRestrictions += Tags.exclusive(Exclusive))
Expand Down Expand Up @@ -440,7 +439,7 @@ val circeVersion = "0.14.7"
val circeGenericExtrasVersion = "0.14.3"
val circe = Seq("circe-core", "circe-generic", "circe-parser")
.map("io.circe" %% _ % circeVersion)
val snakeyamlVersion = "2.2"
val snakeyamlVersion = "2.3"

// === Commons ================================================================

Expand Down Expand Up @@ -910,15 +909,6 @@ lazy val `syntax-rust-definition` = project
Compile / compile / javacOptions ++= Seq("-source", "11", "-target", "11")
)

lazy val yaml = (project in file("lib/java/yaml"))
.settings(
frgaalJavaCompilerSetting,
version := "0.1",
libraryDependencies ++= Seq(
"org.yaml" % "snakeyaml" % snakeyamlVersion % "provided"
)
)

lazy val `scala-yaml` = (project in file("lib/scala/yaml"))
.enablePlugins(JPMSPlugin)
.configs(Test)
Expand Down Expand Up @@ -3616,7 +3606,6 @@ lazy val `engine-runner` = project
}.value
)
.dependsOn(`version-output`)
.dependsOn(yaml)
.dependsOn(pkg)
.dependsOn(cli)
.dependsOn(`profiling-utils`)
Expand Down
2 changes: 1 addition & 1 deletion distribution/engine/THIRD-PARTY/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -598,5 +598,5 @@ Copyright notices related to this dependency can be found in the directory `org.

'snakeyaml', licensed under the Apache License, Version 2.0, is distributed with the engine.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.yaml.snakeyaml-2.2`.
Copyright notices related to this dependency can be found in the directory `org.yaml.snakeyaml-2.3`.

2 changes: 1 addition & 1 deletion distribution/launcher/THIRD-PARTY/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,5 @@ Copyright notices related to this dependency can be found in the directory `org.

'snakeyaml', licensed under the Apache License, Version 2.0, is distributed with the launcher.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.yaml.snakeyaml-2.2`.
Copyright notices related to this dependency can be found in the directory `org.yaml.snakeyaml-2.3`.

2 changes: 1 addition & 1 deletion distribution/project-manager/THIRD-PARTY/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -418,5 +418,5 @@ Copyright notices related to this dependency can be found in the directory `org.

'snakeyaml', licensed under the Apache License, Version 2.0, is distributed with the project-manager.
The license file can be found at `licenses/APACHE2.0`.
Copyright notices related to this dependency can be found in the directory `org.yaml.snakeyaml-2.2`.
Copyright notices related to this dependency can be found in the directory `org.yaml.snakeyaml-2.3`.

This file was deleted.

Loading
Loading