@@ -53,14 +53,17 @@ subprojects { Project subProj ->
53
53
subProj. tasks. withType(Javadoc ). configureEach { enabled = false }
54
54
55
55
subProj. afterEvaluate {
56
+ if (! plugins. hasPlugin(" java" )) {
57
+ return
58
+ }
56
59
String jdkCompile = null
57
60
if (project. hasProperty(' minJavaVersionForTests' ) && project. getProperty(' minJavaVersionForTests' ) != JavaVersion . VERSION_1_8 ) {
58
61
def version = JavaVersion . toVersion(project. getProperty(' minJavaVersionForTests' ))
59
62
def name = " java$version . majorVersion "
60
63
jdkCompile = " main_${ name} Implementation"
61
64
}
62
65
configurations. muzzleBootstrap {
63
- exclude group : ' org.snakeyaml' , module : ' snakeyaml-engine' // we vendor this in the agent jar
66
+ exclude group : ' org.snakeyaml' , module : ' snakeyaml-engine' // we vendor this in the agent jar
64
67
}
65
68
dependencies {
66
69
// Apply common dependencies for instrumentation.
@@ -122,10 +125,12 @@ subprojects { Project subProj ->
122
125
}
123
126
124
127
def path = subProj. getPath()
125
- // don't include the redis RequestImpl stub
126
128
if (! path. equals(' :dd-java-agent:instrumentation:vertx-redis-client-3.9:stubs' )) {
127
- parent_project. dependencies {
128
- implementation project(path)
129
+ subProj. plugins. withId(" java" ) {
130
+ // don't include the redis RequestImpl stub
131
+ parent_project. dependencies {
132
+ implementation project(path)
133
+ }
129
134
}
130
135
}
131
136
}
@@ -137,7 +142,7 @@ dependencies {
137
142
implementation project(' :dd-java-agent:agent-builder' )
138
143
}
139
144
140
- if (project. gradle. startParameter. taskNames. any {it. endsWith(" generateMuzzleReport" )}) {
145
+ if (project. gradle. startParameter. taskNames. any { it. endsWith(" generateMuzzleReport" ) }) {
141
146
apply plugin : ' muzzle'
142
147
task(" muzzleInstrumentationReport" ) {
143
148
dependsOn(project. getAllTasks(true ). values(). flatten(). findAll { it. name. endsWith(" generateMuzzleReport" ) })
0 commit comments