Skip to content

Commit

Permalink
chore(build): Upgradle to 8.1.1
Browse files Browse the repository at this point in the history
Manual changes for resolving deprecations in plugin use
  • Loading branch information
zml2008 committed Jun 3, 2023
1 parent decbe1c commit 85be720
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 23 deletions.
16 changes: 1 addition & 15 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ subprojects {
}
}

signWithKeyFromPrefixedProperties("sponge")
val spongeSnapshotRepo = project.findProperty("spongeSnapshotRepo") as String?
val spongeReleaseRepo = project.findProperty("spongeReleaseRepo") as String?
if (spongeReleaseRepo != null && spongeSnapshotRepo != null) {
Expand Down Expand Up @@ -137,21 +138,6 @@ subprojects {
property("url", projectUrl)
}

extensions.findByType(SigningExtension::class)?.apply {
val spongeSigningKey = project.findProperty("spongeSigningKey") as String?
val spongeSigningPassword = project.findProperty("spongeSigningPassword") as String?
if (spongeSigningKey != null && spongeSigningPassword != null) {
val keyFile = file(spongeSigningKey)
if (keyFile.exists()) {
useInMemoryPgpKeys(file(spongeSigningKey).readText(Charsets.UTF_8), spongeSigningPassword)
} else {
useInMemoryPgpKeys(spongeSigningKey, spongeSigningPassword)
}
} else {
signatories = PgpSignatoryProvider() // don't use gpg agent
}
}

extensions.findByType(IndraPluginPublishingExtension::class)?.apply {
pluginIdBase("$group.gradle")
website("https://spongepowered.org/")
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version = "1.0"
indra = "3.1.1"
pluginPublish = "1.2.0"
spotless = "6.19.0"
junit = "5.9.1"
junit = "5.9.3"
mammoth = "1.3.1"

[libraries]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 6 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
6 changes: 5 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ pluginManagement {
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
}

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories { pluginManagement.repositories.forEach { add(it) } }
Expand All @@ -21,5 +25,5 @@ sequenceOf(
"testlib"
).forEach {
include(it)
findProject(":$it")?.name = "${rootProject.name.toLowerCase(java.util.Locale.ROOT)}-$it"
findProject(":$it")?.name = "${rootProject.name.lowercase()}-$it"
}

0 comments on commit 85be720

Please sign in to comment.