Skip to content

Commit d1e0be6

Browse files
dapengzhang0dapengzhang0
authored
all: fix various gradle build warnings
1 parent cf4cd65 commit d1e0be6

File tree

10 files changed

+32
-24
lines changed

10 files changed

+32
-24
lines changed

‎alts/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ javadoc {
6262
}
6363

6464
jar {
65-
// Must use a different classifier to avoid conflicting with shadowJar
66-
classifier = 'original'
65+
// Must use a different archiveClassifier to avoid conflicting with shadowJar
66+
archiveClassifier = 'original'
6767
}
6868

6969
// We want to use grpc-netty-shaded instead of grpc-netty. But we also want our
7070
// source to work with Bazel, so we rewrite the code as part of the build.
7171
shadowJar {
72-
classifier = null
72+
archiveClassifier = null
7373
dependencies {
7474
exclude(dependency {true})
7575
}

‎android-interop-testing/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ tasks.withType(JavaCompile) {
102102
"-Xlint:-cast"
103103
]
104104
appendToProperty(it.options.errorprone.excludedPaths, ".*/R.java", "|")
105+
appendToProperty(
106+
it.options.errorprone.excludedPaths,
107+
".*/src/generated/.*",
108+
"|")
105109
// Reuses source code from grpc-interop-testing, which targets Java 7 (no method references)
106110
options.errorprone.check("UnnecessaryAnonymousClass", CheckSeverity.OFF)
107111
}

‎android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ task javadocs(type: Javadoc) {
5959
}
6060

6161
task javadocJar(type: Jar, dependsOn: javadocs) {
62-
classifier = 'javadoc'
62+
archiveClassifier = 'javadoc'
6363
from javadocs.destinationDir
6464
}
6565

6666
task sourcesJar(type: Jar) {
67-
classifier = 'sources'
67+
archiveClassifier = 'sources'
6868
from android.sourceSets.main.java.srcDirs
6969
}
7070

‎android/src/main/java/io/grpc/android/AndroidChannelBuilder.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import android.util.Log;
2828
import com.google.common.annotations.VisibleForTesting;
2929
import com.google.common.base.Preconditions;
30+
import com.google.errorprone.annotations.InlineMe;
3031
import io.grpc.CallOptions;
3132
import io.grpc.ClientCall;
3233
import io.grpc.ConnectivityState;
@@ -90,6 +91,9 @@ public static AndroidChannelBuilder forAddress(String name, int port) {
9091
*/
9192
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/6043")
9293
@Deprecated
94+
@InlineMe(
95+
replacement = "AndroidChannelBuilder.usingBuilder(builder)",
96+
imports = "io.grpc.android.AndroidChannelBuilder")
9397
public static AndroidChannelBuilder fromBuilder(ManagedChannelBuilder<?> builder) {
9498
return usingBuilder(builder);
9599
}

‎binder/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ task javadocs(type: Javadoc) {
111111
}
112112

113113
task javadocJar(type: Jar, dependsOn: javadocs) {
114-
classifier = 'javadoc'
114+
archiveClassifier = 'javadoc'
115115
from javadocs.destinationDir
116116
}
117117

118118
task sourcesJar(type: Jar) {
119-
classifier = 'sources'
119+
archiveClassifier = 'sources'
120120
from android.sourceSets.main.java.srcDirs
121121
}
122122

‎binder/src/main/java/io/grpc/binder/internal/Inbound.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ final synchronized void handleTransaction(Parcel parcel) {
345345
int index = parcel.readInt();
346346
boolean hasPrefix = TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_PREFIX);
347347
boolean hasMessageData =
348-
(TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_MESSAGE_DATA));
349-
boolean hasSuffix = (TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_SUFFIX));
348+
TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_MESSAGE_DATA);
349+
boolean hasSuffix = TransactionUtils.hasFlag(flags, TransactionUtils.FLAG_SUFFIX);
350350
if (hasPrefix) {
351351
handlePrefix(flags, parcel);
352352
onDeliveryState(State.PREFIX_DELIVERED);

‎cronet/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ task javadocs(type: Javadoc) {
7070
}
7171

7272
task javadocJar(type: Jar, dependsOn: javadocs) {
73-
classifier = 'javadoc'
73+
archiveClassifier = 'javadoc'
7474
from javadocs.destinationDir
7575
}
7676

7777
task sourcesJar(type: Jar) {
78-
classifier = 'sources'
78+
archiveClassifier = 'sources'
7979
from android.sourceSets.main.java.srcDirs
8080
}
8181

‎cronet/src/test/java/io/grpc/cronet/CronetClientStreamTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public void read() {
245245
verify(cronetStream, times(0)).read(isA(ByteBuffer.class));
246246
UrlResponseInfo info =
247247
new UrlResponseInfoImpl(
248-
new ArrayList<String>(), 200, "", responseHeader("200"), false, "", "");
248+
new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0);
249249
callback.onResponseHeadersReceived(cronetStream, info);
250250
verify(cronetStream, times(1)).read(isA(ByteBuffer.class));
251251
ArgumentCaptor<Metadata> metadataCaptor = ArgumentCaptor.forClass(Metadata.class);
@@ -305,7 +305,7 @@ public void streamSucceeded() {
305305
clientStream.request(2);
306306
UrlResponseInfo info =
307307
new UrlResponseInfoImpl(
308-
new ArrayList<String>(), 200, "", responseHeader("200"), false, "", "");
308+
new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0);
309309
callback.onResponseHeadersReceived(cronetStream, info);
310310
verify(cronetStream, times(1)).read(isA(ByteBuffer.class));
311311
// Receive one message
@@ -363,7 +363,7 @@ public void streamSucceededWithGrpcError() {
363363
clientStream.request(2);
364364
UrlResponseInfo info =
365365
new UrlResponseInfoImpl(
366-
new ArrayList<String>(), 200, "", responseHeader("200"), false, "", "");
366+
new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0);
367367
callback.onResponseHeadersReceived(cronetStream, info);
368368
verify(cronetStream, times(1)).read(isA(ByteBuffer.class));
369369

@@ -418,7 +418,7 @@ public void streamFailedAfterResponseHeaderReceived() {
418418
// Receive response header
419419
UrlResponseInfo info =
420420
new UrlResponseInfoImpl(
421-
new ArrayList<String>(), 200, "", responseHeader("200"), false, "", "");
421+
new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0);
422422
callback.onResponseHeadersReceived(cronetStream, info);
423423

424424
CronetException exception = mock(CronetException.class);
@@ -446,7 +446,7 @@ public void streamFailedAfterTrailerReceived() {
446446
// Receive response header
447447
UrlResponseInfo info =
448448
new UrlResponseInfoImpl(
449-
new ArrayList<String>(), 200, "", responseHeader("200"), false, "", "");
449+
new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0);
450450
callback.onResponseHeadersReceived(cronetStream, info);
451451

452452
// Report trailer but not endOfStream.
@@ -478,7 +478,7 @@ public void streamFailedAfterTrailerAndEndOfStreamReceived() {
478478
// Receive response header
479479
UrlResponseInfo info =
480480
new UrlResponseInfoImpl(
481-
new ArrayList<String>(), 200, "", responseHeader("200"), false, "", "");
481+
new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0);
482482
callback.onResponseHeadersReceived(cronetStream, info);
483483

484484
// Report trailer and endOfStream
@@ -531,7 +531,7 @@ public void reportTrailersWhenTrailersReceivedBeforeReadClosed() {
531531
callback.onStreamReady(cronetStream);
532532
UrlResponseInfo info =
533533
new UrlResponseInfoImpl(
534-
new ArrayList<String>(), 200, "", responseHeader("200"), false, "", "");
534+
new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0);
535535
callback.onResponseHeadersReceived(cronetStream, info);
536536
// Receive trailer first
537537
((CronetClientStream.BidirectionalStreamCallback) callback)
@@ -560,7 +560,7 @@ public void reportTrailersWhenTrailersReceivedAfterReadClosed() {
560560
callback.onStreamReady(cronetStream);
561561
UrlResponseInfo info =
562562
new UrlResponseInfoImpl(
563-
new ArrayList<String>(), 200, "", responseHeader("200"), false, "", "");
563+
new ArrayList<>(), 200, "", responseHeader("200"), false, "", "", 0);
564564
callback.onResponseHeadersReceived(cronetStream, info);
565565
// Receive cronet's endOfStream
566566
callback.onReadCompleted(cronetStream, null, ByteBuffer.allocate(0), true);

‎netty/shaded/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ dependencies {
2929
}
3030

3131
jar {
32-
// Must use a different classifier to avoid conflicting with shadowJar
33-
classifier = 'original'
32+
// Must use a different archiveClassifier to avoid conflicting with shadowJar
33+
archiveClassifier = 'original'
3434
}
3535

3636
shadowJar {
37-
classifier = null
37+
archiveClassifier = null
3838
dependencies {
3939
include(project(':grpc-netty'))
4040
include(dependency('io.netty:'))

‎xds/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ sourceSets {
8686
configureProtoCompilation()
8787

8888
jar {
89-
classifier = 'original'
89+
archiveClassifier = 'original'
9090
}
9191

9292
javadoc {
@@ -110,7 +110,7 @@ javadoc {
110110

111111
def prefixName = 'io.grpc.xds'
112112
shadowJar {
113-
classifier = null
113+
archiveClassifier = null
114114
dependencies {
115115
include(project(':grpc-xds'))
116116
}

0 commit comments

Comments
 (0)