From cc1e432a30025f37e9420c7cbf00875de370d433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20K=2EF=2E=20H=C3=B6lzenspies?= Date: Tue, 1 Oct 2024 20:00:46 +0100 Subject: [PATCH] Add `PklProject.deps.json` file with newline for POSIX compliance (#664) * Add Project.deps.json file with newline for POSIX compliance * Fix test cases --- pkl-core/src/main/java/org/pkl/core/project/ProjectDeps.java | 1 + .../input/projects/project6/PklProject.deps.json | 2 +- .../org/pkl/core/project/ProjectDependenciesResolverTest.kt | 1 + .../src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkl-core/src/main/java/org/pkl/core/project/ProjectDeps.java b/pkl-core/src/main/java/org/pkl/core/project/ProjectDeps.java index be18cac8f..f4c9b911c 100644 --- a/pkl-core/src/main/java/org/pkl/core/project/ProjectDeps.java +++ b/pkl-core/src/main/java/org/pkl/core/project/ProjectDeps.java @@ -218,6 +218,7 @@ private void write() throws IOException { } jsonWriter.endObject(); jsonWriter.endObject(); + jsonWriter.newline(); jsonWriter.close(); } } diff --git a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project6/PklProject.deps.json b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project6/PklProject.deps.json index 836079aad..9712574ff 100644 --- a/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project6/PklProject.deps.json +++ b/pkl-core/src/test/files/LanguageSnippetTests/input/projects/project6/PklProject.deps.json @@ -1,4 +1,4 @@ { "schemaVersion": 1, "resolvedDependencies": {} -} \ No newline at end of file +} diff --git a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDependenciesResolverTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDependenciesResolverTest.kt index fdc0c4abd..45c67f2db 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDependenciesResolverTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDependenciesResolverTest.kt @@ -86,6 +86,7 @@ class ProjectDependenciesResolverTest { } } } + """ .trimIndent() ) diff --git a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt index 3a9e4d5ae..bd6812433 100644 --- a/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt +++ b/pkl-core/src/test/kotlin/org/pkl/core/project/ProjectDepsTest.kt @@ -44,6 +44,7 @@ class ProjectDepsTest { } } } + """ .trimIndent()