Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Update patch dependency changes #459

Merged
merged 2 commits into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

/**
* The value in a {@link ConfigurationNode}.
*
* @since 4.0.0
*/
interface ConfigValue<N extends ScopedConfigurationNode<N>, A extends AbstractConfigurationNode<N, A>> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void set(@Nullable Object value) {
if (!(value instanceof Collection)) {
value = Collections.singleton(value);
}
final Collection<@Nullable ?> valueAsList = (Collection<@Nullable ?>) value;
final Collection<? extends @Nullable Object> valueAsList = (Collection<? extends @Nullable Object>) value;
final List<A> newValue = new ArrayList<>(valueAsList.size());

int count = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,29 +79,29 @@ public Set<String> supportedExtensions() {
}

@Override
public ConfigurationLoader<@NonNull ?> create(final Path file) {
public ConfigurationLoader<? extends @NonNull Object> create(final Path file) {
return this.builderMaker.get()
.path(file)
.build();
}

@Override
public ConfigurationLoader<@NonNull ?> create(final Path file, final ConfigurationNode options) {
public ConfigurationLoader<? extends @NonNull Object> create(final Path file, final ConfigurationNode options) {
return this.builderMaker.get()
.from(LoaderOptionSource.node(options))
.path(file)
.build();
}

@Override
public ConfigurationLoader<@NonNull ?> create(final URL url) {
public ConfigurationLoader<? extends @NonNull Object> create(final URL url) {
return this.builderMaker.get()
.url(url)
.build();
}

@Override
public ConfigurationLoader<@NonNull ?> create(final URL url, final ConfigurationNode options) {
public ConfigurationLoader<? extends @NonNull Object> create(final URL url, final ConfigurationNode options) {
return this.builderMaker.get()
.from(LoaderOptionSource.node(options))
.url(url)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static Set<ConfigurationFormat> supportedFormats() {
* @return a newly configured loader
* @since 4.2.0
*/
default ConfigurationLoader<@NonNull ?> create(Path file) {
default ConfigurationLoader<? extends @NonNull Object> create(Path file) {
return create(file, BasicConfigurationNode.factory().createNode());
}

Expand All @@ -105,7 +105,7 @@ static Set<ConfigurationFormat> supportedFormats() {
* @return a newly configured loader
* @since 4.2.0
*/
ConfigurationLoader<@NonNull ?> create(Path file, ConfigurationNode options);
ConfigurationLoader<? extends @NonNull Object> create(Path file, ConfigurationNode options);

/**
* Create a new loader configured to load from the provided URL,
Expand All @@ -117,7 +117,7 @@ static Set<ConfigurationFormat> supportedFormats() {
* @return a newly configured loader
* @since 4.2.0
*/
default ConfigurationLoader<@NonNull ?> create(URL url) {
default ConfigurationLoader<? extends @NonNull Object> create(URL url) {
return create(url, BasicConfigurationNode.factory().createNode());
}

Expand All @@ -131,6 +131,6 @@ static Set<ConfigurationFormat> supportedFormats() {
* @return a newly configured loader
* @since 4.2.0
*/
ConfigurationLoader<@NonNull?> create(URL url, ConfigurationNode options);
ConfigurationLoader<? extends @NonNull Object> create(URL url, ConfigurationNode options);

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* A registration that is transaction-aware.
*
* @param <V> value type
* @since 4.0.0
*/
interface TransactionalRegistration<V> extends AbstractProcessor.Registration<V> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import java.util.concurrent.Executor;
import java.util.function.Function;

class ValueReferenceImpl<@Nullable T, N extends ScopedConfigurationNode<N>> implements ValueReference<T, N>, Publisher<T> {
class ValueReferenceImpl<T extends @Nullable Object, N extends ScopedConfigurationNode<N>> implements ValueReference<T, N>, Publisher<T> {

// Information about the reference
private final ManualConfigurationReference<N> root;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public Optional<?> deserialize(final AnnotatedType type, final ConfigurationNode
}

@Override
@SuppressWarnings("NullableOptional") // needed for type signature
public void serialize(final AnnotatedType type, final @Nullable Optional<?> obj, final ConfigurationNode node) throws SerializationException {
if (obj == null || !obj.isPresent()) {
node.set(null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,11 @@ public TypeSerializerCollection build() {
}
}

/**
* A serializer registration.
*
* @since 4.2.0
*/
interface RegisteredSerializer {

boolean matches(Type test);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import java.io.IOException;

@SuppressWarnings("AlmostJavadoc")
final class JacksonVisitor implements ConfigurationVisitor<JsonGenerator, Void, ConfigurateException> {

static final ThreadLocal<JacksonVisitor> INSTANCE = ThreadLocal.withInitial(JacksonVisitor::new);
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
assertj="3.25.1"
autoValue="1.10.4"
checkerQual="3.42.0"
checkstyle="10.12.5"
checkstyle="10.12.7"
geantyref = "1.3.14"
errorprone="2.24.1"
indra = "3.1.3"
junit="5.10.1"
ktlint="0.49.1"
ktfmt="0.46"
pmd = "6.55.0"
spotless = "6.23.2"
spotless = "6.23.3"

[libraries]
# Shared
Expand Down Expand Up @@ -47,15 +47,15 @@ guice-runtime = "com.google.inject:guice:5.0.1"

# Formats
gson = "com.google.code.gson:gson:2.8.0" # Fixed version, to avoid using API not present in older MC
jackson = "com.fasterxml.jackson.core:jackson-core:2.16.0"
jackson = "com.fasterxml.jackson.core:jackson-core:2.16.1"

# Tool
clikt = "com.github.ajalt:clikt:2.8.0"
jansi = "org.fusesource.jansi:jansi:2.4.1"

# Build
build-codenarc = { module = "org.codenarc:CodeNarc", version = "3.3.0-groovy-4.0" }
build-codenarcGroovy = { module = "org.apache.groovy:groovy-all", version = "4.0.16" }
build-codenarcGroovy = { module = "org.apache.groovy:groovy-all", version = "4.0.17" }
build-errorprone = "net.ltgt.gradle:gradle-errorprone-plugin:3.1.0"
build-forbiddenApis = "de.thetaphi:forbiddenapis:3.6"
build-goomph = "com.diffplug.gradle:goomph:3.44.0"
Expand Down