classifierWithLikes breaks protobuf-gradle-plugin
It causes it to try to download protoc with _fedora in its classifier.
diff --git a/build.gradle b/build.gradle
index e7b1c27..7bc3c22 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,6 @@
apply plugin: "jacoco"
apply plugin: "com.google.osdetector"
- // Configure a special classifier on Fedora-"like" systems.
- osdetector.classifierWithLikes = ['fedora']
group = "io.grpc"
version = "0.10.0-SNAPSHOT"
@@ -112,6 +110,13 @@
}
}
+ def tcnative_suffix = osdetector.classifier;
+ // Fedora variants use a different soname for OpenSSL than other linux distributions
+ // (see http://netty.io/wiki/forked-tomcat-native.html).
+ if (osdetector.os == "linux" && osdetector.release.isLike("fedora")) {
+ tcnative_suffix += "_fedora";
+ }
+
def epoll_suffix = "";
if (osdetector.classifier in ["linux-x86_64"]) {
// The native code is only pre-compiled on certain platforms.
@@ -131,7 +136,7 @@
protobuf_plugin: 'com.google.protobuf:protobuf-gradle-plugin:0.7.0',
netty: 'io.netty:netty-codec-http2:4.1.0.Beta6',
- netty_tcnative: 'io.netty:netty-tcnative:1.1.33.Fork7:' + osdetector.classifier,
+ netty_tcnative: 'io.netty:netty-tcnative:1.1.33.Fork7:' + tcnative_suffix,
netty_transport_native_epoll: 'io.netty:netty-transport-native-epoll:4.1.0.Beta6' + epoll_suffix,
// Test dependencies.