define direct dependency on apache commons
Resolves #383, Resolves #375, Resolves #367
This commit is contained in:
parent
9b468a2101
commit
6f37512673
@ -12,6 +12,10 @@
|
||||
|
||||
- Update dependencies
|
||||
|
||||
### Fixed
|
||||
|
||||
- Define direct dependency on Apache Commons
|
||||
|
||||
## [4.4.4] - 2023-12-11
|
||||
|
||||
### Fixed
|
||||
|
@ -25,6 +25,8 @@ repositories {
|
||||
dependencies {
|
||||
// implementation(libs.annotations)
|
||||
implementation(libs.json5.java)
|
||||
implementation(libs.commons.lang3)
|
||||
implementation(libs.commons.text)
|
||||
}
|
||||
|
||||
// Set the JVM language level used to build the project.
|
||||
|
@ -2,6 +2,8 @@
|
||||
# libraries
|
||||
annotations = "24.1.0"
|
||||
json5-java = "2.0.0"
|
||||
commons-lang3 = "3.14.0"
|
||||
commons-text = "1.11.0"
|
||||
|
||||
# plugins
|
||||
kotlin = "1.9.23"
|
||||
@ -13,6 +15,8 @@ kover = "0.7.6"
|
||||
[libraries]
|
||||
annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
|
||||
json5-java = { group = "de.marhali", name = "json5-java", version.ref = "json5-java" }
|
||||
commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" }
|
||||
commons-text = { group = "org.apache.commons", name = "commons-text", version.ref = "commons-text" }
|
||||
|
||||
[plugins]
|
||||
changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
|
||||
|
@ -1,6 +1,7 @@
|
||||
package de.marhali.easyi18n.io.parser;
|
||||
|
||||
import de.marhali.easyi18n.util.StringUtil;
|
||||
|
||||
import org.apache.commons.text.StringEscapeUtils;
|
||||
|
||||
import java.text.MessageFormat;
|
||||
|
@ -7,6 +7,7 @@ import com.google.gson.JsonPrimitive;
|
||||
import de.marhali.easyi18n.model.TranslationNode;
|
||||
import de.marhali.easyi18n.model.TranslationValue;
|
||||
import de.marhali.easyi18n.util.StringUtil;
|
||||
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.apache.commons.text.StringEscapeUtils;
|
||||
|
||||
|
@ -5,6 +5,7 @@ import de.marhali.easyi18n.util.StringUtil;
|
||||
import de.marhali.json5.Json5;
|
||||
import de.marhali.json5.Json5Array;
|
||||
import de.marhali.json5.Json5Primitive;
|
||||
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
|
@ -6,6 +6,7 @@ import de.marhali.easyi18n.util.StringUtil;
|
||||
import de.marhali.json5.Json5Element;
|
||||
import de.marhali.json5.Json5Object;
|
||||
import de.marhali.json5.Json5Primitive;
|
||||
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.apache.commons.text.StringEscapeUtils;
|
||||
|
||||
|
@ -5,6 +5,7 @@ import de.marhali.easyi18n.model.KeyPath;
|
||||
import de.marhali.easyi18n.model.TranslationValue;
|
||||
import de.marhali.easyi18n.util.KeyPathConverter;
|
||||
import de.marhali.easyi18n.util.StringUtil;
|
||||
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.apache.commons.text.StringEscapeUtils;
|
||||
|
||||
|
@ -3,6 +3,7 @@ package de.marhali.easyi18n.io.parser.yaml;
|
||||
import de.marhali.easyi18n.model.TranslationNode;
|
||||
import de.marhali.easyi18n.model.TranslationValue;
|
||||
import de.marhali.easyi18n.util.StringUtil;
|
||||
|
||||
import org.apache.commons.lang3.math.NumberUtils;
|
||||
import org.apache.commons.text.StringEscapeUtils;
|
||||
|
||||
@ -42,7 +43,7 @@ public class YamlMapper {
|
||||
// Nested node - run recursively
|
||||
Map<String, Object> childSection = new HashMap<>();
|
||||
write(locale, childSection, childNode);
|
||||
if(childSection.size() > 0) {
|
||||
if(!childSection.isEmpty()) {
|
||||
section.put(key, childSection);
|
||||
}
|
||||
} else {
|
||||
|
Loading…
x
Reference in New Issue
Block a user