Skip to content

Commit 6d2517f

Browse files
committed
Update buildscript, Gradle 8.14.3
1 parent 1f76e1f commit 6d2517f

File tree

5 files changed

+8
-14
lines changed

5 files changed

+8
-14
lines changed

build.gradle

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import org.gradle.api.attributes.java.TargetJvmVersion
21
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
32

43
plugins {
@@ -11,6 +10,7 @@ plugins {
1110
}
1211

1312
final projectDisplayName = 'Git Version'
13+
final projectArtifactId = base.archivesName = 'gitversion'
1414
final projectVendor = 'Forge Development LLC'
1515
description = 'Used by MinecraftForge projects to calculate project versions based on Git history.'
1616
group = 'net.minecraftforge'
@@ -19,17 +19,11 @@ version = gitversion.tagOffset
1919
println "Version: $version"
2020

2121
java {
22-
toolchain.languageVersion = JavaLanguageVersion.of 17
22+
toolchain.languageVersion = JavaLanguageVersion.of(17)
2323
withSourcesJar()
2424
}
2525

2626
configurations {
27-
named('shadowRuntimeElements') {
28-
attributes {
29-
attribute TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17
30-
}
31-
}
32-
3327
resolvable('shadowOnly') {
3428
description = 'Implementation dependencies that are not declared as required dependencies.'
3529
}
@@ -103,14 +97,14 @@ publishing {
10397
publications.register('mavenJava', MavenPublication) {
10498
from components.java
10599

106-
artifactId = project.name
100+
artifactId = projectArtifactId
107101
changelog.publish it
108102

109103
pom { pom ->
110104
name = projectDisplayName
111105
description = project.description
112106

113-
gradleutils.pom.gitHubDetails = pom
107+
gradleutils.pom.setGitHubDetails(pom)
114108

115109
licenses {
116110
license gradleutils.pom.licenses.LGPLv2_1

gradle/wrapper/gradle-wrapper.jar

122 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

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-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.

settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencyResolutionManagement {
1313
versionCatalogs.register('libs') {
1414
// Plugins
1515
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0'
16-
plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '2.5.1'
17-
plugin 'shadow', 'com.gradleup.shadow' version '8.3.6'
16+
plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '2.6.0'
17+
plugin 'shadow', 'com.gradleup.shadow' version '9.0.0-rc3'
1818

1919
// Git
2020
library 'jgit', 'org.eclipse.jgit', 'org.eclipse.jgit' version '7.2.0.202503040940-r'

0 commit comments

Comments
 (0)