diff --git a/buildSrc/src/main/kotlin/config-publish.gradle.kts b/buildSrc/src/main/kotlin/config-publish.gradle.kts index c44d8f7c..76539ceb 100644 --- a/buildSrc/src/main/kotlin/config-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/config-publish.gradle.kts @@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id("org.jetbrains.kotlin.jvm") - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") id("com.gradle.plugin-publish") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d80249b5..e55347f4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,8 +51,8 @@ mockk = "io.mockk:mockk:1.13.8" # Gradle gradle-licenser = "net.kyori:indra-licenser-spotless:3.1.3" gradle-spotless = "com.diffplug.spotless:spotless-plugin-gradle:6.23.1" -gradle-shadow = "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:8.1.1" -gradle-kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.1.1" +gradle-shadow = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.5" +gradle-kotlin-dsl = "org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:5.1.2" gradle-plugin-kotlin = { module = "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin" } gradle-plugin-publish = "com.gradle.publish:plugin-publish-plugin:1.2.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1d5e018..e0fd0202 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d..f3b75f3b 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/IncludeMappings.kt b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/IncludeMappings.kt index e3b64e2e..7e99f861 100644 --- a/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/IncludeMappings.kt +++ b/paperweight-lib/src/main/kotlin/io/papermc/paperweight/tasks/IncludeMappings.kt @@ -50,7 +50,7 @@ abstract class IncludeMappings : BaseTask() { } @TaskAction - private fun addMappings() { + fun addMappings() { outputJar.path.parent.createDirectories() inputJar.path.copyTo(outputJar.path, overwrite = true) outputJar.path.openZip().use { fs ->