Skip to content

Commit 986c74a

Browse files
authored
Depend on sourcesJar task if present (#78)
1 parent a63fe67 commit 986c74a

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

plugin/src/e2e/groovy/com/github/joselion/strictnullcheck/StrictNullCheckPluginE2E.groovy

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class StrictNullCheckPluginE2E extends Specification {
1515
buildGradle.bytes = []
1616
buildGradle << '''\
1717
|plugins {
18-
| id('java')
19-
| id('com.github.joselion.strict-null-check')
18+
| id 'java'
19+
| id 'com.github.joselion.strict-null-check'
2020
|}
2121
|
2222
|repositories {
@@ -46,8 +46,8 @@ class StrictNullCheckPluginE2E extends Specification {
4646
buildGradle.bytes = []
4747
buildGradle << '''\
4848
|plugins {
49-
| id('java')
50-
| id('com.github.joselion.strict-null-check')
49+
| id 'java'
50+
| id 'com.github.joselion.strict-null-check'
5151
|}
5252
|
5353
|repositories {
@@ -91,8 +91,8 @@ class StrictNullCheckPluginE2E extends Specification {
9191
buildGradle.bytes = []
9292
buildGradle << '''\
9393
|plugins {
94-
| id('java')
95-
| id('com.github.joselion.strict-null-check')
94+
| id 'java'
95+
| id 'com.github.joselion.strict-null-check'
9696
|}
9797
|
9898
|repositories {
@@ -137,8 +137,8 @@ class StrictNullCheckPluginE2E extends Specification {
137137
buildGradle.bytes = []
138138
buildGradle << '''\
139139
|plugins {
140-
| id('java')
141-
| id('com.github.joselion.strict-null-check')
140+
| id 'java'
141+
| id 'com.github.joselion.strict-null-check'
142142
|}
143143
|
144144
|repositories {

plugin/src/main/groovy/com/github/joselion/strictnullcheck/StrictNullCheckPlugin.groovy

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ class StrictNullCheckPlugin implements Plugin<Project> {
2727
packageJavadoc = project.strictNullCheck.packageJavadoc
2828
}
2929

30-
project.tasks.compileJava.dependsOn(project.tasks.generatePackageInfo)
30+
['compileJava', 'sourcesJar'].forEach {
31+
project.tasks.findByName(it)?.dependsOn(project.tasks.generatePackageInfo)
32+
}
3133

3234
project.sourceSets.main.java {
3335
srcDir("${project.strictNullCheck.generatedDir.get()}/java/main")

plugin/src/test/groovy/com/github/joselion/strictnullcheck/StrictNullCheckPluginTest.groovy

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,23 @@ class StrictNullCheckPluginTest extends Specification {
3636
project.tasks.findByName('generatePackageInfo') != null
3737
}
3838

39-
def 'the compileJava task depends on generatePackageInfo task'() {
39+
def 'the [compileJava, sourcesJar] tasks depend on the generatePackageInfo task'() {
4040
given:
4141
def project = ProjectBuilder.builder().build()
4242

4343
when:
4444
project.plugins.apply('java')
45+
project.java.withSourcesJar()
4546
project.plugins.apply('com.github.joselion.strict-null-check')
4647

4748
then:
4849
def generateTask = project.tasks.findByName('generatePackageInfo')
4950
def compileJavaTask = project.tasks.getByName('compileJava')
51+
def sourcesJarTask = project.tasks.getByName('sourcesJar')
5052

5153
generateTask != null
5254
compileJavaTask != null
5355
compileJavaTask.getDependsOn().contains(generateTask) == true
56+
sourcesJarTask.getDependsOn().contains(generateTask) == true
5457
}
5558
}

0 commit comments

Comments
 (0)