diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 7c46d5f8c590..4a304c35a8f9 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -74,6 +74,7 @@ + @@ -1438,11 +1439,6 @@ - - - - - diff --git a/subprojects/distributions-dependencies/build.gradle.kts b/subprojects/distributions-dependencies/build.gradle.kts index 9df0dde2b721..1125295a4326 100644 --- a/subprojects/distributions-dependencies/build.gradle.kts +++ b/subprojects/distributions-dependencies/build.gradle.kts @@ -135,7 +135,7 @@ dependencies { api(libs.plist) { version { strictly("1.21") }} api(libs.servletApi) { version { strictly("3.1.0") }} api(libs.slf4jApi) { version { strictly(slf4jVersion) }} - api(libs.snakeyaml) { version { strictly("1.32") }} + api(libs.snakeyaml) { version { strictly("2.0") }} api(libs.testng) { version { strictly("6.3.1"); because("later versions break test cross-version test filtering") }} api(libs.tomlj) { version { strictly(tomljVersion) }} api(libs.trove4j) { version { strictly("1.0.20200330") }} diff --git a/subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/swift/SwiftDepsHandler.java b/subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/swift/SwiftDepsHandler.java index 0abdbc388106..bfc58fd44a56 100644 --- a/subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/swift/SwiftDepsHandler.java +++ b/subprojects/platform-native/src/main/java/org/gradle/nativeplatform/toolchain/internal/swift/SwiftDepsHandler.java @@ -21,6 +21,7 @@ import org.gradle.internal.IoActions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.Constructor; @@ -64,7 +65,7 @@ SwiftDeps parse(File moduleSwiftDeps) throws FileNotFoundException { return IoActions.withResource(new FileInputStream(moduleSwiftDeps), new Transformer() { @Override public SwiftDeps transform(FileInputStream fileInputStream) { - Yaml yaml = new Yaml(new Constructor(SwiftDeps.class)); + Yaml yaml = new Yaml(new Constructor(SwiftDeps.class, new LoaderOptions())); return yaml.loadAs(fileInputStream, SwiftDeps.class); } }); @@ -86,7 +87,7 @@ private void write(File moduleSwiftDeps, final SwiftDeps swiftDeps) { public void execute(BufferedWriter bufferedWriter) { // Rewrite swiftc generated YAML file with our understanding of the current state of // swift sources. This doesn't use Yaml.dump because snakeyaml produces a YAML file - // that swiftc cannot read. + // that swiftc cannot read. PrintWriter pw = new PrintWriter(bufferedWriter); pw.println("version: \"" + swiftDeps.version + "\""); pw.println("options: \"" + swiftDeps.options + "\"");