Skip to content

Commit

Permalink
Merge pull request #49 from KyoriPowered/renovate/gradle-and-github-a…
Browse files Browse the repository at this point in the history
…ctions

chore(deps): Update gradle and github actions
  • Loading branch information
zml2008 authored Aug 27, 2023
2 parents 4c001c9 + cc440a4 commit 3f8622d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
alias libs.plugins.indra.checkstyle
alias libs.plugins.indra.licenserSpotless
alias libs.plugins.indra.sonatype
alias libs.plugins.nexusPublish
}

group = "net.kyori"
Expand All @@ -22,6 +23,7 @@ dependencies {
testImplementation platform(libs.junit.bom)
testImplementation libs.junit.api
testRuntimeOnly libs.junit.engine
testRuntimeOnly libs.junit.launcher
}

tasks.withType(Test).configureEach {
Expand Down
8 changes: 5 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version = "1.0"

[versions]
checkstyle = "10.12.2"
indra = "3.1.1"
indra = "3.1.2"
junit = "5.10.0"
stylecheck = "0.2.1"
errorprone = "2.20.0"
Expand All @@ -16,6 +16,7 @@ junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
junit-api = { module = "org.junit.jupiter:junit-jupiter-api" }
junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
junit-platformCommons = { module = "org.junit.platform:junit-platform-commons" }
junit-launcher = { module = "org.junit.platform:junit-platform-launcher"}

# build
stylecheck = { module = "ca.stellardrift:stylecheck", version.ref = "stylecheck" }
Expand All @@ -25,9 +26,10 @@ errorprone = { module = "com.google.errorprone:error_prone_core", version.ref =
zCheckstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }

[plugins]
errorprone = "net.ltgt.errorprone:3.1.0"
indra = { id = "net.kyori.indra", version.ref = "indra" }
indra-checkstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" }
indra-licenserSpotless = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" }
indra-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" }
errorprone = "net.ltgt.errorprone:3.1.0"
spotless = { id = "com.diffplug.spotless", version = "6.19.0" }
nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-1"}
spotless = { id = "com.diffplug.spotless", version = "6.20.0" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 6 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "org.gradle.toolchains.foojay-resolver-convention" version "0.5.0"
id "org.gradle.toolchains.foojay-resolver-convention" version "0.7.0"
}

rootProject.name = "mammoth"
Expand Down

0 comments on commit 3f8622d

Please sign in to comment.