diff --git a/alts/build.gradle b/alts/build.gradle index 25e8b16024..a056799d4f 100644 --- a/alts/build.gradle +++ b/alts/build.gradle @@ -62,14 +62,14 @@ javadoc { } jar { - // Must use a different classifier to avoid conflicting with shadowJar - classifier = 'original' + // Must use a different archiveClassifier to avoid conflicting with shadowJar + archiveClassifier = 'original' } // We want to use grpc-netty-shaded instead of grpc-netty. But we also want our // source to work with Bazel, so we rewrite the code as part of the build. shadowJar { - classifier = null + archiveClassifier = null dependencies { exclude(dependency {true}) } diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle index 9ede49593d..e40507e6a3 100644 --- a/android-interop-testing/build.gradle +++ b/android-interop-testing/build.gradle @@ -102,6 +102,10 @@ tasks.withType(JavaCompile) { "-Xlint:-cast" ] appendToProperty(it.options.errorprone.excludedPaths, ".*/R.java", "|") + appendToProperty( + it.options.errorprone.excludedPaths, + ".*/src/generated/.*", + "|") // Reuses source code from grpc-interop-testing, which targets Java 7 (no method references) options.errorprone.check("UnnecessaryAnonymousClass", CheckSeverity.OFF) } diff --git a/android/build.gradle b/android/build.gradle index b0916f9e04..7e32ac5ca2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -59,12 +59,12 @@ task javadocs(type: Javadoc) { } task javadocJar(type: Jar, dependsOn: javadocs) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadocs.destinationDir } task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier = 'sources' from android.sourceSets.main.java.srcDirs } diff --git a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java index 8c69ca68b5..19b2b1a234 100644 --- a/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java +++ b/android/src/main/java/io/grpc/android/AndroidChannelBuilder.java @@ -27,6 +27,7 @@ import android.os.Build; import android.util.Log; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; +import com.google.errorprone.annotations.InlineMe; import io.grpc.CallOptions; import io.grpc.ClientCall; import io.grpc.ConnectivityState; @@ -90,6 +91,9 @@ public final class AndroidChannelBuilder extends ForwardingChannelBuilder builder) { return usingBuilder(builder); } diff --git a/binder/build.gradle b/binder/build.gradle index fa9d0d8cee..dc3da4c9a7 100644 --- a/binder/build.gradle +++ b/binder/build.gradle @@ -111,12 +111,12 @@ task javadocs(type: Javadoc) { } task javadocJar(type: Jar, dependsOn: javadocs) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadocs.destinationDir } task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier = 'sources' from android.sourceSets.main.java.srcDirs } diff --git a/binder/src/main/java/io/grpc/binder/internal/Inbound.java b/binder/src/main/java/io/grpc/binder/internal/Inbound.java index f28b9bfb29..da1a296154 100644 --- a/binder/src/main/java/io/grpc/binder/internal/Inbound.java +++ b/binder/src/main/java/io/grpc/binder/internal/Inbound.java @@ -345,8 +345,8 @@ abstract class Inbound implements StreamListener.Messa int index = parcel.readInt(); boolean hasPrefix = TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_PREFIX); boolean hasMessageData = - (TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_MESSAGE_DATA)); - boolean hasSuffix = (TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_SUFFIX)); + TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_MESSAGE_DATA); + boolean hasSuffix = TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_SUFFIX); if (hasPrefix) { handlePrefix(flags, parcel); onDeliveryState(State.PREFIX_DELIVERED); diff --git a/cronet/build.gradle b/cronet/build.gradle index e0a0b7b53a..d66eaf3a18 100644 --- a/cronet/build.gradle +++ b/cronet/build.gradle @@ -70,12 +70,12 @@ task javadocs(type: Javadoc) { } task javadocJar(type: Jar, dependsOn: javadocs) { - classifier = 'javadoc' + archiveClassifier = 'javadoc' from javadocs.destinationDir } task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier = 'sources' from android.sourceSets.main.java.srcDirs } diff --git a/cronet/src/test/java/io/grpc/cronet/CronetClientStreamTest.java b/cronet/src/test/java/io/grpc/cronet/CronetClientStreamTest.java index 48ce71c493..1d17dfe9be 100644 --- a/cronet/src/test/java/io/grpc/cronet/CronetClientStreamTest.java +++ b/cronet/src/test/java/io/grpc/cronet/CronetClientStreamTest.java @@ -245,7 +245,7 @@ public final class CronetClientStreamTest { verify(cronetStream, times(0)).read(isA(ByteBuffer.class)); UrlResponseInfo info = new UrlResponseInfoImpl( - new ArrayList(), 200, "", responseHeader("200"), false, "", ""); + new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0); callback.onResponseHeadersReceived(cronetStream, info); verify(cronetStream, times(1)).read(isA(ByteBuffer.class)); ArgumentCaptor metadataCaptor = ArgumentCaptor.forClass(Metadata.class); @@ -305,7 +305,7 @@ public final class CronetClientStreamTest { clientStream.request(2); UrlResponseInfo info = new UrlResponseInfoImpl( - new ArrayList(), 200, "", responseHeader("200"), false, "", ""); + new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0); callback.onResponseHeadersReceived(cronetStream, info); verify(cronetStream, times(1)).read(isA(ByteBuffer.class)); // Receive one message @@ -363,7 +363,7 @@ public final class CronetClientStreamTest { clientStream.request(2); UrlResponseInfo info = new UrlResponseInfoImpl( - new ArrayList(), 200, "", responseHeader("200"), false, "", ""); + new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0); callback.onResponseHeadersReceived(cronetStream, info); verify(cronetStream, times(1)).read(isA(ByteBuffer.class)); @@ -418,7 +418,7 @@ public final class CronetClientStreamTest { // Receive response header UrlResponseInfo info = new UrlResponseInfoImpl( - new ArrayList(), 200, "", responseHeader("200"), false, "", ""); + new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0); callback.onResponseHeadersReceived(cronetStream, info); CronetException exception = mock(CronetException.class); @@ -446,7 +446,7 @@ public final class CronetClientStreamTest { // Receive response header UrlResponseInfo info = new UrlResponseInfoImpl( - new ArrayList(), 200, "", responseHeader("200"), false, "", ""); + new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0); callback.onResponseHeadersReceived(cronetStream, info); // Report trailer but not endOfStream. @@ -478,7 +478,7 @@ public final class CronetClientStreamTest { // Receive response header UrlResponseInfo info = new UrlResponseInfoImpl( - new ArrayList(), 200, "", responseHeader("200"), false, "", ""); + new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0); callback.onResponseHeadersReceived(cronetStream, info); // Report trailer and endOfStream @@ -531,7 +531,7 @@ public final class CronetClientStreamTest { callback.onStreamReady(cronetStream); UrlResponseInfo info = new UrlResponseInfoImpl( - new ArrayList(), 200, "", responseHeader("200"), false, "", ""); + new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0); callback.onResponseHeadersReceived(cronetStream, info); // Receive trailer first ((CronetClientStream.BidirectionalStreamCallback) callback) @@ -560,7 +560,7 @@ public final class CronetClientStreamTest { callback.onStreamReady(cronetStream); UrlResponseInfo info = new UrlResponseInfoImpl( - new ArrayList(), 200, "", responseHeader("200"), false, "", ""); + new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0); callback.onResponseHeadersReceived(cronetStream, info); // Receive cronet's endOfStream callback.onReadCompleted(cronetStream, null, ByteBuffer.allocate(0), true); diff --git a/netty/shaded/build.gradle b/netty/shaded/build.gradle index 6b1dad644d..3bd1b087d8 100644 --- a/netty/shaded/build.gradle +++ b/netty/shaded/build.gradle @@ -29,12 +29,12 @@ dependencies { } jar { - // Must use a different classifier to avoid conflicting with shadowJar - classifier = 'original' + // Must use a different archiveClassifier to avoid conflicting with shadowJar + archiveClassifier = 'original' } shadowJar { - classifier = null + archiveClassifier = null dependencies { include(project(':grpc-netty')) include(dependency('io.netty:')) diff --git a/xds/build.gradle b/xds/build.gradle index 16b1c87790..60bd4c7c60 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -86,7 +86,7 @@ sourceSets { configureProtoCompilation() jar { - classifier = 'original' + archiveClassifier = 'original' } javadoc { @@ -110,7 +110,7 @@ javadoc { def prefixName = 'io.grpc.xds' shadowJar { - classifier = null + archiveClassifier = null dependencies { include(project(':grpc-xds')) }