Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sourceSets {
}

group 'net.neoforged.gradleutils'
version '5.0.5' // renovate bump
version '5.1.0' // renovate bump

repositories {
mavenCentral()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ abstract class GradleUtilsExtension {
private final Directory rootProjectDir
private final Provider<String> projectVersion
private final Provider<String> calculatedVersion
private final Provider<String> finalVersion
@PackageScope
final Provider<GitInfoValueSource.GitInfo> rawInfo
private final Provider<Map<String, String>> gitInfo
Expand All @@ -77,6 +78,9 @@ abstract class GradleUtilsExtension {
}
}

var versionProperty = providers.gradleProperty('version')
this.finalVersion = versionProperty.orElse(calculatedVersion)

this.rawInfo = providers.of(GitInfoValueSource) {
it.parameters {
it.workingDirectory.set(this.gitRoot)
Expand Down Expand Up @@ -141,7 +145,7 @@ abstract class GradleUtilsExtension {
return new Object() {
@Override
String toString() {
return calculatedVersion.get()
return finalVersion.get()
}
}
}
Expand Down
Loading