Skip to content

Commit c31ace0

Browse files
committed
Fix subprojects failing to publish changelogs
Temporarily disabled changelog gen for this build so that it will work.
1 parent 249e312 commit c31ace0

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

gradle-plugin/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22
import com.github.jengelman.gradle.plugins.shadow.ShadowJavaPlugin
3-
import net.minecraftforge.gradleutils.GradleUtilsExtensionForProject
43
import org.gradle.api.attributes.plugin.GradlePluginApiVersion
54

65
plugins {
@@ -13,7 +12,7 @@ plugins {
1312
id 'net.minecraftforge.gradleutils'
1413
alias libs.plugins.licenser
1514
alias libs.plugins.gitversion
16-
alias libs.plugins.changelog
15+
//alias libs.plugins.changelog
1716
alias libs.plugins.plugin.publish
1817
alias libs.plugins.shadow
1918
}
@@ -101,10 +100,12 @@ tasks.withType(Javadoc).configureEach {
101100
}
102101
}
103102

103+
/*
104104
changelog {
105105
fromBase()
106106
publishAll = false
107107
}
108+
*/
108109

109110
gradlePlugin {
110111
website.set gitversion.url
@@ -121,7 +122,7 @@ gradlePlugin {
121122

122123
publishing {
123124
publications.register('pluginMaven', MavenPublication) {
124-
changelog.publish(it)
125+
//changelog.publish(it)
125126

126127
pom { pom ->
127128
name = projectDisplayName

gradle-plugin/changelog-gradle/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
id 'net.minecraftforge.gradleutils'
1313
alias libs.plugins.licenser
1414
alias libs.plugins.gitversion
15-
alias libs.plugins.changelog
15+
//alias libs.plugins.changelog
1616
alias libs.plugins.plugin.publish
1717
alias libs.plugins.shadow
1818
}
@@ -97,10 +97,12 @@ tasks.withType(Javadoc).configureEach {
9797
}
9898
}
9999

100+
/*
100101
changelog {
101102
fromBase()
102103
publishAll = false
103104
}
105+
*/
104106

105107
gradlePlugin {
106108
website = gitversion.url
@@ -117,7 +119,7 @@ gradlePlugin {
117119

118120
publishing {
119121
publications.register('pluginMaven', MavenPublication) {
120-
changelog.publish(it)
122+
//changelog.publish(it)
121123

122124
pom { pom ->
123125
name = projectDisplayName

gradle-plugin/changelog-gradle/src/main/groovy/net/minecraftforge/gitversion/gradle/changelog/ChangelogExtensionImpl.groovy

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ import org.gradle.api.tasks.TaskProvider
1616

1717
import javax.inject.Inject
1818

19-
/** The heart of the Changelog plugin. This extension is used to enable and partially configure the changelog generation task. */
2019
@CompileStatic
2120
@PackageScope([PackageScopeTarget.CLASS, PackageScopeTarget.FIELDS])
2221
abstract class ChangelogExtensionImpl implements ChangelogExtensionInternal {
23-
public static final String NAME = 'changelog'
24-
2522
private final Project project
2623

2724
private final Property<Boolean> publishingAll
@@ -45,7 +42,7 @@ abstract class ChangelogExtensionImpl implements ChangelogExtensionInternal {
4542
}
4643

4744
private void finish(Project project) {
48-
if (this.publishAll)
45+
if (this.publishAll.getOrElse(false))
4946
ChangelogUtils.setupChangelogGenerationOnAllPublishTasks(project)
5047
}
5148

gradle-plugin/changelog-gradle/src/main/groovy/net/minecraftforge/gitversion/gradle/changelog/ChangelogUtils.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import groovy.transform.PackageScope
99
import groovy.transform.PackageScopeTarget
1010
import org.gradle.api.Project
1111
import org.gradle.api.Task
12+
import org.gradle.api.file.FileCollection
1213
import org.gradle.api.publish.PublishingExtension
1314
import org.gradle.api.publish.maven.MavenArtifact
1415
import org.gradle.api.publish.maven.MavenPublication
16+
import org.gradle.api.tasks.TaskOutputs
1517
import org.gradle.api.tasks.TaskProvider
1618
import org.gradle.language.base.plugins.LifecycleBasePlugin
1719
import org.jetbrains.annotations.Nullable
@@ -60,7 +62,7 @@ class ChangelogUtils {
6062
}
6163

6264
// if the project with changelog is publishing all changelogs, set up changelogs for the subproject
63-
if (changelog?.publishAll)
65+
if (changelog?.publishAll?.getOrElse(false))
6466
setupChangelogGenerationForAllPublications(subproject)
6567
}
6668
}
@@ -122,7 +124,7 @@ class ChangelogUtils {
122124
var task = findChangelogTask(project)
123125

124126
// Add a new changelog artifact and publish it
125-
publication.artifact(task.get().outputs.files.singleFile) { artifact ->
127+
publication.artifact(task.map { it.outputs.files.singleFile }) { artifact ->
126128
artifact.builtBy(task)
127129
artifact.classifier = 'changelog'
128130
artifact.extension = 'txt'

0 commit comments

Comments
 (0)