Skip to content

Commit 85be720

Browse files
committed
chore(build): Upgradle to 8.1.1
Manual changes for resolving deprecations in plugin use
1 parent decbe1c commit 85be720

File tree

6 files changed

+14
-23
lines changed

6 files changed

+14
-23
lines changed

build.gradle.kts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ subprojects {
8989
}
9090
}
9191

92+
signWithKeyFromPrefixedProperties("sponge")
9293
val spongeSnapshotRepo = project.findProperty("spongeSnapshotRepo") as String?
9394
val spongeReleaseRepo = project.findProperty("spongeReleaseRepo") as String?
9495
if (spongeReleaseRepo != null && spongeSnapshotRepo != null) {
@@ -137,21 +138,6 @@ subprojects {
137138
property("url", projectUrl)
138139
}
139140

140-
extensions.findByType(SigningExtension::class)?.apply {
141-
val spongeSigningKey = project.findProperty("spongeSigningKey") as String?
142-
val spongeSigningPassword = project.findProperty("spongeSigningPassword") as String?
143-
if (spongeSigningKey != null && spongeSigningPassword != null) {
144-
val keyFile = file(spongeSigningKey)
145-
if (keyFile.exists()) {
146-
useInMemoryPgpKeys(file(spongeSigningKey).readText(Charsets.UTF_8), spongeSigningPassword)
147-
} else {
148-
useInMemoryPgpKeys(spongeSigningKey, spongeSigningPassword)
149-
}
150-
} else {
151-
signatories = PgpSignatoryProvider() // don't use gpg agent
152-
}
153-
}
154-
155141
extensions.findByType(IndraPluginPublishingExtension::class)?.apply {
156142
pluginIdBase("$group.gradle")
157143
website("https://spongepowered.org/")

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version = "1.0"
55
indra = "3.1.1"
66
pluginPublish = "1.2.0"
77
spotless = "6.19.0"
8-
junit = "5.9.1"
8+
junit = "5.9.3"
99
mammoth = "1.3.1"
1010

1111
[libraries]

gradle/wrapper/gradle-wrapper.jar

502 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

gradlew

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ done
8585
APP_BASE_NAME=${0##*/}
8686
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
8787

88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
90-
9188
# Use the maximum available, or set MAX_FD != -1 to use that value.
9289
MAX_FD=maximum
9390

@@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144141
case $MAX_FD in #(
145142
max*)
146143
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
144+
# shellcheck disable=SC3045
148145
MAX_FD=$( ulimit -H -n ) ||
149146
warn "Could not query maximum file descriptor limit"
150147
esac
151148
case $MAX_FD in #(
152149
'' | soft) :;; #(
153150
*)
154151
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
152+
# shellcheck disable=SC3045
156153
ulimit -n "$MAX_FD" ||
157154
warn "Could not set maximum file descriptor limit to $MAX_FD"
158155
esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
197194
done
198195
fi
199196

197+
198+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200+
200201
# Collect all arguments for the java command;
201202
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202203
# shell script including quotes and variable substitutions, so put them in

settings.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ pluginManagement {
66
}
77
}
88

9+
plugins {
10+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
11+
}
12+
913
dependencyResolutionManagement {
1014
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1115
repositories { pluginManagement.repositories.forEach { add(it) } }
@@ -21,5 +25,5 @@ sequenceOf(
2125
"testlib"
2226
).forEach {
2327
include(it)
24-
findProject(":$it")?.name = "${rootProject.name.toLowerCase(java.util.Locale.ROOT)}-$it"
28+
findProject(":$it")?.name = "${rootProject.name.lowercase()}-$it"
2529
}

0 commit comments

Comments
 (0)