Skip to content

Commit

Permalink
chore(deps): Update patch dependency changes (#424)
Browse files Browse the repository at this point in the history
* chore(deps): Update patch dependency changes

* chore(build): Fix Detekt running on J21

* chore(build): Fix Javadoc links paths

* chore(build): Fix new Checkstyle failures

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: zml <[email protected]>
  • Loading branch information
renovate[bot] and zml2008 authored Oct 14, 2023
1 parent 202a82c commit bf7360e
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
import net.kyori.indra.util.Versioning
import org.eclipse.jgit.lib.Repository
import org.gradle.api.artifacts.CacheableRule
import org.gradle.api.artifacts.ComponentMetadataContext
Expand Down Expand Up @@ -79,8 +80,8 @@ tasks.withType(Javadoc).configureEach {
options.links(
"https://lightbend.github.io/config/latest/api/",
"https://fasterxml.github.io/jackson-core/javadoc/2.10/",
"https://www.javadoc.io/doc/org.checkerframework/checker-qual/${libs.versions.checkerQual}/",
"https://www.javadoc.io/doc/io.leangen.geantyref/geantyref/${libs.versions.geantyref}/"
"https://www.javadoc.io/doc/org.checkerframework/checker-qual/${libs.versions.checkerQual.get()}/",
"https://www.javadoc.io/doc/io.leangen.geantyref/geantyref/${libs.versions.geantyref.get()}/"
)
options.linkSource()
}
Expand Down Expand Up @@ -144,6 +145,11 @@ plugins.withId('org.jetbrains.kotlin.jvm') {

ktfmt(libs.versions.ktfmt.get()).kotlinlangStyle()
}
plugins.withId("io.gitlab.arturbosch.detekt") {
tasks.named("detekt").configure {
jvmTarget = Versioning.versionString(indra.javaVersions().target().get())
}
}
}

tasks.named('copyJavadoc') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void testDefaultsApplied() throws SerializationException {
}

@ConfigSerializable
private static class CommentedObject {
private static final class CommentedObject {
@Setting("commented-key")
@Comment("You look nice today")
private String color;
Expand Down Expand Up @@ -150,7 +150,7 @@ void testNoArglessConstructor() {
}

@ConfigSerializable
private static class TestObjectChild extends TestObject {
private static final class TestObjectChild extends TestObject {
@Setting("child-setting") private boolean childSetting;
}

Expand All @@ -167,7 +167,7 @@ void testSuperclassFieldsIncluded() throws SerializationException {
}

@ConfigSerializable
private static class FieldNameObject {
private static final class FieldNameObject {
@Setting private boolean loads;
}

Expand All @@ -181,12 +181,12 @@ void testKeyFromFieldName() throws SerializationException {
assertTrue(obj.loads);
}

private static class ParentObject {
private static final class ParentObject {
@Comment("Comment on parent") private InnerObject inner = new InnerObject();
}

@ConfigSerializable
private static class InnerObject {
private static final class InnerObject {
@Comment("Something") private String test = "Default value";
}

Expand All @@ -206,7 +206,7 @@ private interface ParentInterface {
String test();
}

private static class ChildObject implements ParentInterface {
private static final class ChildObject implements ParentInterface {
@Comment("Something") private String test = "Default value";

@Override public String test() {
Expand All @@ -215,7 +215,7 @@ private static class ChildObject implements ParentInterface {
}

@ConfigSerializable
private static class ContainingObject {
private static final class ContainingObject {
@Setting ParentInterface inner = new ChildObject();
@Setting List<ParentInterface> list = new ArrayList<>();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void testSerializeCustomNumber() {
assertNull(serializer, "Type serializer for custom number class should be null!");
}

private static class CustomNumber extends Number {
private static final class CustomNumber extends Number {
public static final long serialVersionUID = 4647727438607023527L;

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ void testMapSerializerPreservesChildComments() throws SerializationException {
}

@ConfigSerializable
private static class TestObject {
private static final class TestObject {
@Setting("int") private int value;
@Setting private String name;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

class GuiceObjectMapperTest {

private static class TestModule extends AbstractModule {
private static final class TestModule extends AbstractModule {
@Override
protected void configure() {
this.bind(String.class).toInstance("test value");
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
assertj="3.24.2"
autoValue="1.10.2"
autoValue="1.10.4"
checkerQual="3.38.0"
checkstyle="10.12.1"
checkstyle="10.12.4"
geantyref = "1.3.14"
errorprone="2.22.0"
indra = "3.1.3"
Expand All @@ -19,7 +19,7 @@ autoValue = { module = "com.google.auto.value:auto-value", version.ref = "autoVa
autoValue-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "autoValue" }
errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
guava = "com.google.guava:guava:32.1.1-jre"
guava = "com.google.guava:guava:32.1.3-jre"
junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
stylecheck = "ca.stellardrift:stylecheck:0.2.1"
Expand All @@ -46,19 +46,19 @@ 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
hocon = "com.typesafe:config:1.4.2"
jackson = "com.fasterxml.jackson.core:jackson-core:2.15.2"
jackson = "com.fasterxml.jackson.core:jackson-core:2.15.3"

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

# Build
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.43.0"
build-indra = { module = "net.kyori:indra-common", version.ref = "indra" }
build-indra-crossdoc = { module = "net.kyori:indra-crossdoc", version.ref = "indra" }
build-japicmp-plugin = "me.champeau.gradle:japicmp-gradle-plugin:0.4.1"
build-japicmp-plugin = "me.champeau.gradle:japicmp-gradle-plugin:0.4.2"
build-japicmp = { module = "com.github.siom79.japicmp:japicmp", version.require = "0.15.+" }
build-nullaway = "net.ltgt.gradle:gradle-nullaway-plugin:1.6.0"
build-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
Expand Down
1 change: 0 additions & 1 deletion tool/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import io.gitlab.arturbosch.detekt.Detekt
import kotlinx.coroutines.scheduling.TasksKt
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand Down

0 comments on commit bf7360e

Please sign in to comment.