Skip to content

Commit 389ca61

Browse files
committed
Simplify status configuration.
1 parent be07ef9 commit 389ca61

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

gradle/convention.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// GRADLE-2087 workaround, perform after java plugin
2-
status = project.hasProperty('preferredStatus') ? project.preferredStatus : (version.contains('SNAPSHOT') ? 'snapshot' : 'release')
3-
41
subprojects {
52
if (!subprojects.empty) { // is a container
63
return
@@ -23,8 +20,7 @@ subprojects {
2320
sourceCompatibility = JavaVersion.VERSION_1_6
2421
targetCompatibility = JavaVersion.VERSION_1_6
2522

26-
// Restore status after Java plugin
27-
status = rootProject.status
23+
status = project.hasProperty('preferredStatus') ? project.preferredStatus : (version.contains('SNAPSHOT') ? 'snapshot' : 'release')
2824

2925
task sourcesJar(type: Jar, dependsOn: classes) {
3026
from sourceSets.main.allSource

0 commit comments

Comments
 (0)