diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1e65b8b2..0efc4f6c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,4 +9,6 @@ on: jobs: call-build: uses: "KyoriPowered/.github/.github/workflows/shared-ci.yaml@trunk" - secrets: "inherit" \ No newline at end of file + secrets: "inherit" + with: + gradle_warning_mode: 'all' # allow deprecations until an update is available for the JMH plugin diff --git a/build.gradle.kts b/build.gradle.kts index f97d2e1e0..2205b1483 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ plugins { alias(libs.plugins.indra.sonatype) + alias(libs.plugins.nexusPublish) } // Project metadata is configured in gradle.properties diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9d6d349ed..89d4f9f4d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ checkstyle = "10.12.2" errorprone = "2.21.1" examination = "1.3.0" guava = "32.1.2-jre" -indra = "3.1.2" +indra = "3.1.3" jmh = "1.36" jmhPlugin = "0.7.1" junit = "5.10.0" @@ -44,6 +44,7 @@ ansi = "net.kyori:ansi:1.0.3" 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" } +junit-launcher = { module = "org.junit.platform:junit-platform-launcher" } junit-params = { module = "org.junit.jupiter:junit-jupiter-params" } truth = { module = "com.google.truth:truth", version.ref = "truth" } truth-java8 = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truth" } @@ -72,4 +73,5 @@ zJmh = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } [plugins] indra-sonatype = { id = "net.kyori.indra.publishing.sonatype", version.ref = "indra" } jmh = { id = "me.champeau.jmh", version.ref = "jmhPlugin" } -kotlin = "org.jetbrains.kotlin.jvm:1.8.21" +kotlin = "org.jetbrains.kotlin.jvm:1.9.10" +nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0-rc-1" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79e..7f93135c4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d3f..ac72c34e8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index aeb74cbb4..0adc8e1a5 100755 --- a/gradlew +++ b/gradlew @@ -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 @@ -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. diff --git a/settings.gradle.kts b/settings.gradle.kts index 031b4b2b3..2315f71a6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,7 +14,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")