From 9668bccef1daed74e431c9264063fd611aeb5bce Mon Sep 17 00:00:00 2001 From: TopchetoEU <36534413+TopchetoEU@users.noreply.github.com> Date: Fri, 10 Jan 2025 00:53:29 +0200 Subject: [PATCH] fix: circular dependency on metadata when parsing --- gradle.properties | 2 +- src/main/java/me/topchetoeu/j2s/common/Metadata.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ced1745..2b8d90c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ project_group = me.topchetoeu project_name = j2s -project_version = 0.10.2-beta +project_version = 0.10.3-beta main_class = me.topchetoeu.j2s.repl.SimpleRepl diff --git a/src/main/java/me/topchetoeu/j2s/common/Metadata.java b/src/main/java/me/topchetoeu/j2s/common/Metadata.java index 35907de..3e13e0a 100644 --- a/src/main/java/me/topchetoeu/j2s/common/Metadata.java +++ b/src/main/java/me/topchetoeu/j2s/common/Metadata.java @@ -1,6 +1,7 @@ package me.topchetoeu.j2s.common; import me.topchetoeu.j2s.common.json.JSON; +import me.topchetoeu.j2s.common.parsing.Filename; public class Metadata { private static final String VERSION; @@ -8,7 +9,7 @@ public class Metadata { private static final String NAME; static { - var data = JSON.parse(null, Reading.resourceToString("metadata.json")).map(); + var data = JSON.parse(new Filename("internal", "metadata.json"), Reading.resourceToString("metadata.json")).map(); VERSION = data.string("version"); AUTHOR = data.string("author"); NAME = data.string("name");