Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SpongePowered/Configurate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 222ad4c2b5c809b690794ad6283f8a2bd27e640e
Choose a base ref
..
head repository: SpongePowered/Configurate
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 12a45ecbb5aa8a56b11ae044318ed1e56f245afe
Choose a head ref
Showing with 15 additions and 15 deletions.
  1. +2 −2 .github/workflows/test-build.yml
  2. +12 −12 gradle/libs.versions.toml
  3. +1 −1 gradle/wrapper/gradle-wrapper.properties
4 changes: 2 additions & 2 deletions .github/workflows/test-build.yml
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ jobs:
ORG_GRADLE_PROJECT_spongeKeyStorePassword: "${{ secrets.CONFIGURATE_JARSIGNING_PASSWORD }}"
- name: Publish to GH pages
if: "${{ runner.os == 'Linux' && ((env.STATUS == 'release' && github.event_name == 'release') || (env.STATUS != 'release' && github.event_name != 'release' && (steps.setup.outputs.publishing_branch != ''))) }}"
uses: JamesIves/github-pages-deploy-action@v4.6.0
uses: JamesIves/github-pages-deploy-action@v4.6.3
with:
branch: gh-pages
force: false
@@ -95,7 +95,7 @@ jobs:
installation_retrieval_payload: "SpongePowered/APIJavadocs"
- name: Publish Javadoc to Sponge index
if: "${{ runner.os == 'Linux' && ((env.STATUS == 'release' && github.event_name == 'release') || (env.STATUS != 'release' && github.event_name != 'release' && (steps.setup.outputs.publishing_branch != ''))) }}"
uses: JamesIves/github-pages-deploy-action@v4.6.0
uses: JamesIves/github-pages-deploy-action@v4.6.3
with:
folder: build/publish-jd
repository-name: SpongePowered/APIJavadocs
24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
assertj="3.25.3"
autoValue="1.10.4"
assertj="3.26.3"
autoValue="1.11.0"
checkerQual="3.43.0"
checkstyle="10.16.0"
checkstyle="10.17.0"
geantyref = "1.3.15"
errorprone="2.27.1"
indra = "3.1.3"
junit="5.10.2"
junit="5.10.3"
ktlint="0.49.1"
ktfmt="0.51"
ktfmt="0.52"
pmd = "6.55.0"
spotless = "6.25.0"

@@ -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:33.1.0-jre"
guava = "com.google.guava:guava:33.2.1-jre"
junit-api = { module = "org.junit.jupiter:junit-jupiter-api" }
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
@@ -47,22 +47,22 @@ 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.17.0"
jackson = "com.fasterxml.jackson.core:jackson-core:2.17.2"

# 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.4.0-groovy-4.0" }
build-codenarcGroovy = { module = "org.apache.groovy:groovy-all", version = "4.0.21" }
build-codenarcGroovy = { module = "org.apache.groovy:groovy-all", version = "4.0.22" }
build-errorprone = "net.ltgt.gradle:gradle-errorprone-plugin:3.1.0"
build-forbiddenApis = "de.thetaphi:forbiddenapis:3.7"
build-goomph = "com.diffplug.gradle:goomph:3.44.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.2"
build-japicmp = { module = "com.github.siom79.japicmp:japicmp", version.require = "0.21.+" }
build-japicmp-plugin = "me.champeau.gradle:japicmp-gradle-plugin:0.4.3"
build-japicmp = { module = "com.github.siom79.japicmp:japicmp", version.require = "0.22.+" }
build-nullaway = "net.ltgt.gradle:gradle-nullaway-plugin:2.0.0"
build-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
build-shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }
@@ -73,13 +73,13 @@ zCheckstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "check
zKtfmt = { module = "com.facebook:ktfmt", version.ref = "ktfmt" }

[plugins]
aggregateJavadoc = "io.freefair.aggregate-javadoc-jar:8.6"
aggregateJavadoc = "io.freefair.aggregate-javadoc-jar:8.7.1"
detekt = "io.gitlab.arturbosch.detekt:1.23.6"
dokka = "org.jetbrains.dokka:1.9.20"
gitPublish = "org.ajoberstar.git-publish:3.0.1"
gitpatcher = { id = "ca.stellardrift.gitpatcher", version = "1.1.0" }
indra-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
kotlin = "org.jetbrains.kotlin.jvm:1.9.23"
kotlin = "org.jetbrains.kotlin.jvm:1.9.25"
nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME