Skip to content

Commit 3697ae9

Browse files
committed
fix: #362 use project instead of rootProject to get the release extension
1 parent dfe5aab commit 3697ae9

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

src/main/groovy/net/researchgate/release/tasks/BaseReleaseTask.groovy

+2-11
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,9 @@ class BaseReleaseTask extends DefaultTask {
2626
@Internal
2727
Map<String, Object> pluginAttributes
2828

29-
@Internal
30-
Project getRootProject() {
31-
def project = getProject()
32-
if (project.getParent() != null) {
33-
return project.getParent()
34-
}
35-
return project
36-
}
37-
3829
BaseReleaseTask() {
3930
group = RELEASE_GROUP
40-
extension = getRootProject().extensions.getByName('release') as ReleaseExtension
31+
extension = project.extensions.getByName('release') as ReleaseExtension
4132
pluginAttributes = extension.attributes
4233
}
4334

@@ -128,7 +119,7 @@ class BaseReleaseTask extends DefaultTask {
128119
}
129120

130121
String findProperty(String key, Object defaultVal = null, String deprecatedKey = null) {
131-
Project project = getRootProject()
122+
Project project = project
132123
def property = System.getProperty(key) ?: project.hasProperty(key) ? project.property(key) : null
133124

134125
if (!property && deprecatedKey) {

src/main/groovy/net/researchgate/release/tasks/PreTagCommit.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class PreTagCommit extends BaseReleaseTask {
1717

1818
@TaskAction
1919
void preTagCommit() {
20-
BaseScmAdapter scmAdapter = ((ReleaseExtension) getRootProject().extensions.getByName("release")).scmAdapter
20+
BaseScmAdapter scmAdapter = ((ReleaseExtension) project.extensions.getByName("release")).scmAdapter
2121
Map<String, Object> projectAttributes = extension.attributes
2222
if (projectAttributes.usesSnapshot || projectAttributes.versionModified || projectAttributes.propertiesFileCreated) {
2323
// should only be committed if the project was using a snapshot version.

src/main/groovy/net/researchgate/release/tasks/PrepareVersions.groovy

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ class PrepareVersions extends BaseReleaseTask {
1313

1414
@TaskAction
1515
def prepareVersions() {
16-
Project rootProject = getRootProject()
1716
String versionPropertyFilepath = extension.versionPropertyFile.get()
18-
File rootVersionFile = rootProject.file(versionPropertyFilepath)
17+
File rootVersionFile = project.file(versionPropertyFilepath)
1918
if (rootVersionFile.file) {
2019
return
2120
}

0 commit comments

Comments
 (0)