diff --git a/build.gradle b/build.gradle index 95d853a..559b21c 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ scmVersion { allprojects { apply plugin: 'java' sourceCompatibility = 1.8 - targetCompatibility = 1.8 + targetCompatibility = 1.17 repositories { mavenCentral() @@ -25,11 +25,11 @@ allprojects { project.version = scmVersion.version ext.jetbrains = [ - version : "2022.2", - pycharm : "PythonCore:222.3345.40", - rubymine: "org.jetbrains.plugins.ruby:222.3345.16", - goland : "org.jetbrains.plugins.go:222.3345.90", - scala : "org.intellij.scala:2022.2.3" + version : "2024.2.1", + pycharm : "PythonCore:242.21829.142", + rubymine: "org.jetbrains.plugins.ruby:242.21829.142", + goland : "org.jetbrains.plugins.go:242.21829.142", + scala : "org.intellij.scala:2024.2.25" ] } @@ -65,4 +65,4 @@ tasks { sinceBuild.set("201") } -} \ No newline at end of file +} diff --git a/modules/core/src/main/java/net/ashald/envfile/providers/yaml/YamlEnvFileParser.java b/modules/core/src/main/java/net/ashald/envfile/providers/yaml/YamlEnvFileParser.java index 799b8d3..cebe904 100644 --- a/modules/core/src/main/java/net/ashald/envfile/providers/yaml/YamlEnvFileParser.java +++ b/modules/core/src/main/java/net/ashald/envfile/providers/yaml/YamlEnvFileParser.java @@ -4,7 +4,9 @@ import net.ashald.envfile.providers.EnvFileParser; import org.yaml.snakeyaml.Yaml; +import java.util.LinkedHashMap; import java.util.Map; +import java.util.Set; @AllArgsConstructor public class YamlEnvFileParser implements EnvFileParser { @@ -12,6 +14,18 @@ public class YamlEnvFileParser implements EnvFileParser { @Override public Map parse(String content) { - return yaml.load(content); + Map value = yaml.load(content); + Set keys = value.keySet(); + Map result = new LinkedHashMap<>(); + for (String key : keys) { + Object v = value.get(key); + if (v != null && v.getClass().equals(String.class)) { + result.put(key, (String) v); + } else { + String stringValue = String.valueOf(v); + result.put(key, stringValue); + } + } + return result; } } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 224ed46..ae8f259 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ net.ashald.envfile EnvFile - 3.4.1 + 3.4.3 Borys Pierov