woggioni/wson
1
0
Fork 0
Code Actions Packages Activity

update Gradle to 8.3

Browse Source
This commit is contained in:
Walter Oggioni
2023-09-30 05:56:07 +08:00
parent 809a6c9408
commit 67161e92aa
13 changed files with 39 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/src/main/java/net/woggioni/wson/benchmark/Main.java
View File

@@ -3,11 +3,11 @@ package net.woggioni.wson.benchmark;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import net.woggioni.jwo.Chronometer;
import net.woggioni.wson.antlr.JSONLexer; import net.woggioni.wson.antlr.JSONLexer;
import net.woggioni.wson.antlr.JSONListenerImpl; import net.woggioni.wson.antlr.JSONListenerImpl;
import net.woggioni.wson.serialization.binary.JBONParser; import net.woggioni.wson.serialization.binary.JBONParser;
import net.woggioni.wson.serialization.json.JSONParser; import net.woggioni.wson.serialization.json.JSONParser;
import net.woggioni.jwo.Chronometer;
import net.woggioni.wson.value.ObjectValue; import net.woggioni.wson.value.ObjectValue;
import net.woggioni.wson.xface.Value; import net.woggioni.wson.xface.Value;
import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStream;

4
build.gradle
View File

@@ -39,10 +39,6 @@ allprojects {
test { test {
useJUnitPlatform() useJUnitPlatform()
} }
java {
modularity.inferModulePath = true
}
} }
ext { ext {

4
gradle.properties
View File

@@ -1,4 +1,4 @@
wson.version = 2023.03 wson.version = 2023.009.30
lys.version = 2023.03 lys.version = 2023.09.26

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

7
gradlew vendored
View File

@@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done done
fi fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command; # Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in # shell script including quotes and variable substitutions, so put them in

5
src/main/java/net/woggioni/wson/value/ArrayValue.java
View File

@@ -4,7 +4,10 @@ import lombok.EqualsAndHashCode;
import lombok.NonNull; import lombok.NonNull;
import net.woggioni.wson.xface.Value; import net.woggioni.wson.xface.Value;
import java.util.*; import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@EqualsAndHashCode @EqualsAndHashCode
public class ArrayValue implements Value, Iterable<Value> { public class ArrayValue implements Value, Iterable<Value> {

12
src/main/java/net/woggioni/wson/value/ObjectValue.java
View File

@@ -2,10 +2,18 @@ package net.woggioni.wson.value;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import static net.woggioni.jwo.JWO.newThrowable;
import net.woggioni.wson.xface.Value; import net.woggioni.wson.xface.Value;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
import static net.woggioni.jwo.JWO.newThrowable;
public interface ObjectValue extends Value, Iterable<Map.Entry<String, Value>> { public interface ObjectValue extends Value, Iterable<Map.Entry<String, Value>> {

2
src/main/java/net/woggioni/wson/value/StringValue.java
View File

@@ -4,8 +4,6 @@ import lombok.EqualsAndHashCode;
import lombok.NonNull; import lombok.NonNull;
import net.woggioni.wson.xface.Value; import net.woggioni.wson.xface.Value;
import java.util.Objects;
@EqualsAndHashCode @EqualsAndHashCode
public class StringValue implements Value { public class StringValue implements Value {

7
src/test/java/net/woggioni/wson/serialization/binary/JBONTest.java
View File

@@ -9,7 +9,12 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.api.io.TempDir;
import java.io.*; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;

22
wson-cli/src/main/kotlin/net/woggioni/wson/cli/main.kt
View File

@@ -1,22 +1,22 @@
package net.woggioni.wson.cli package net.woggioni.wson.cli
import com.beust.jcommander.IStringConverter
import com.beust.jcommander.JCommander
import com.beust.jcommander.Parameter
import com.beust.jcommander.ParameterException
import com.beust.jcommander.converters.PathConverter
import kotlin.system.exitProcess
import net.woggioni.wson.serialization.binary.JBONDumper
import net.woggioni.wson.serialization.binary.JBONParser
import net.woggioni.wson.serialization.json.JSONDumper
import net.woggioni.wson.serialization.json.JSONParser
import net.woggioni.wson.xface.Value
import java.io.BufferedInputStream import java.io.BufferedInputStream
import java.io.BufferedOutputStream import java.io.BufferedOutputStream
import java.io.InputStreamReader import java.io.InputStreamReader
import java.io.OutputStreamWriter import java.io.OutputStreamWriter
import java.nio.file.Files import java.nio.file.Files
import java.nio.file.Path import java.nio.file.Path
import kotlin.system.exitProcess
import com.beust.jcommander.IStringConverter
import com.beust.jcommander.JCommander
import com.beust.jcommander.Parameter
import com.beust.jcommander.ParameterException
import com.beust.jcommander.converters.PathConverter
import net.woggioni.wson.serialization.binary.JBONDumper
import net.woggioni.wson.serialization.binary.JBONParser
import net.woggioni.wson.serialization.json.JSONDumper
import net.woggioni.wson.serialization.json.JSONParser
import net.woggioni.wson.xface.Value
sealed class SerializationFormat(val name: String) { sealed class SerializationFormat(val name: String) {

1
wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonProvider.java
View File

@@ -12,7 +12,6 @@ import jakarta.json.stream.JsonGenerator;
import jakarta.json.stream.JsonGeneratorFactory; import jakarta.json.stream.JsonGeneratorFactory;
import jakarta.json.stream.JsonParser; import jakarta.json.stream.JsonParser;
import jakarta.json.stream.JsonParserFactory; import jakarta.json.stream.JsonParserFactory;
import net.woggioni.wson.value.ObjectValue;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;

15
wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonValue.java
View File

@@ -1,24 +1,9 @@
package net.woggioni.wson.jakarta; package net.woggioni.wson.jakarta;
import jakarta.json.JsonArray;
import jakarta.json.JsonNumber;
import jakarta.json.JsonObject;
import jakarta.json.JsonString;
import jakarta.json.JsonValue; import jakarta.json.JsonValue;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import net.woggioni.jwo.CollectionUtils;
import net.woggioni.jwo.JWO;
import net.woggioni.wson.xface.Value; import net.woggioni.wson.xface.Value;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
import static net.woggioni.jwo.JWO.newThrowable;
@RequiredArgsConstructor @RequiredArgsConstructor
public class WsonJsonValue implements JsonValue { public class WsonJsonValue implements JsonValue {
private final Value value; private final Value value;