From 1bbe126b447e5dba8ad13dfd0a20ce8340db80c5 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 11 Dec 2017 13:55:36 -0800 Subject: [PATCH] core: Use hard-coded string for version Using META-INF for loading the version is broken on Android and frequently broken when gRPC is shaded. Having hard-coded strings be replaced on version bumps has been working well. Fixes #2098 --- RELEASING.md | 1 + core/src/main/java/io/grpc/internal/GrpcUtil.java | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index a22319055e..1062ebc4d1 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -64,6 +64,7 @@ $ MAJOR=1 MINOR=7 PATCH=0 # Set appropriately for new release $ VERSION_FILES=( build.gradle android-interop-testing/app/build.gradle + core/src/main/java/io/grpc/internal/GrpcUtil.java examples/build.gradle examples/pom.xml examples/android/helloworld/app/build.gradle diff --git a/core/src/main/java/io/grpc/internal/GrpcUtil.java b/core/src/main/java/io/grpc/internal/GrpcUtil.java index 266c749019..3dad57fd83 100644 --- a/core/src/main/java/io/grpc/internal/GrpcUtil.java +++ b/core/src/main/java/io/grpc/internal/GrpcUtil.java @@ -195,7 +195,7 @@ public final class GrpcUtil { public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); - private static final String IMPLEMENTATION_VERSION = getImplementationVersion(); + private static final String IMPLEMENTATION_VERSION = "1.9.0-SNAPSHOT"; // CURRENT_GRPC_VERSION /** * The default delay in nanos before we send a keepalive. @@ -741,12 +741,4 @@ public final class GrpcUtil { } private GrpcUtil() {} - - private static String getImplementationVersion() { - String version = GrpcUtil.class.getPackage().getImplementationVersion(); - if (version != null) { - return "/" + version; - } - return ""; - } }