Skip to content

Fix build #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
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
19 changes: 11 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,17 @@ task codeCoverageReport(type: JacocoReport) {
csv.required.set(true)
}
dependsOn {
subprojects.stream().flatMap { p ->
p.getTasks()
.getAsMap()
.entrySet()
.stream()
.filter {[ "delombok","javadoc"].contains(it.key) || it.value instanceof Test }
.map {it.value}
}.collect(Collectors.toList())
subprojects.collectMany { subproject ->
def tasksToDependOn = []
tasksToDependOn.add(subproject.tasks.test)
if (subproject.tasks.findByName("delombok")) {
tasksToDependOn.add(subproject.tasks.delombok)
}
if (subproject.tasks.findByName("javadoc")) {
tasksToDependOn.add(subproject.tasks.javadoc)
}
return tasksToDependOn
}
}
}

Expand Down
11 changes: 5 additions & 6 deletions grpc-spring-boot-starter-demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
classpath "com.netflix.nebula:nebula-project-plugin:9.4.0"
classpath "com.netflix.nebula:nebula-project-plugin:11.0.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -20,7 +20,7 @@ apply plugin: 'kotlin'
apply plugin: 'com.google.protobuf'
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: "nebula.facet"
apply plugin: "com.netflix.nebula.facet"

facets {
pureNettyTest
Expand Down Expand Up @@ -55,17 +55,16 @@ configurations.findAll { cfg ->
cfg.exclude group: 'org.springframework.cloud', module: 'spring-cloud-starter-consul-discovery'

}


}


extensions.facets.each {
facets.each {
if (it.name.endsWith("Test")) {
configurations.getByName("${it.name}Implementation").extendsFrom(configurations.testImplementation)
configurations.getByName("${it.name}RuntimeOnly").extendsFrom(configurations.testRuntimeOnly)

dependencies.add("${it.name}Implementation", sourceSets.test.output)

tasks.test.dependsOn it.name
}
}

Expand Down