@@ -41,6 +41,9 @@ subprojects {
41
41
}
42
42
}
43
43
44
+ def isAndroid = project. name in [
45
+ ' grpc-android' , ' grpc-android-interop-testing' , ' grpc-cronet' ]
46
+
44
47
ext {
45
48
def exeSuffix = osdetector. os == ' windows' ? " .exe" : " "
46
49
protocPluginBaseName = ' protoc-gen-grpc-java'
@@ -54,7 +57,6 @@ subprojects {
54
57
opencensusVersion = ' 0.24.0'
55
58
56
59
configureProtoCompilation = {
57
- boolean isAndroid = project. getName(). contains(' android' )
58
60
String generatedSourcePath = " ${ projectDir} /src/generated"
59
61
project. protobuf {
60
62
protoc {
@@ -187,16 +189,20 @@ subprojects {
187
189
]
188
190
}
189
191
190
- // Define a separate configuration for managing the dependency on Jetty ALPN agent.
191
192
configurations {
192
- compile {
193
- // Detect Maven Enforcer's dependencyConvergence failures. We only
194
- // care for artifacts used as libraries by others.
195
- if (! (project. name in [
193
+ // Detect Maven Enforcer's dependencyConvergence failures. We only
194
+ // care for artifacts used as libraries by others.
195
+ if (isAndroid && ! (project. name in [' grpc-android-interop-testing' ])) {
196
+ releaseRuntimeClasspath {
197
+ resolutionStrategy. failOnVersionConflict()
198
+ }
199
+ }
200
+ if (! isAndroid && ! (project. name in [
196
201
' grpc-benchmarks' ,
197
202
' grpc-interop-testing' ,
198
203
' grpc-gae-interop-testing-jdk8' ,
199
- ])) {
204
+ ])) {
205
+ runtimeClasspath {
200
206
resolutionStrategy. failOnVersionConflict()
201
207
}
202
208
}
0 commit comments