Skip to content

Commit d940507

Browse files
ejona86kannanjgithub
authored andcommitted
s2a: Use new-style syntax for plugins and remove unused deps
There may be more unused deps, but grpc#11527 makes it far too painful for me to bother to clean it up more.
1 parent 0cfa7e6 commit d940507

File tree

1 file changed

+2
-40
lines changed

1 file changed

+2
-40
lines changed

s2a/build.gradle

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
1-
buildscript {
2-
dependencies {
3-
classpath 'com.google.gradle:osdetector-gradle-plugin:1.4.0'
4-
}
5-
}
6-
71
plugins {
82
id "java-library"
93
id "maven-publish"
104

115
id "com.github.johnrengelman.shadow"
6+
id "com.google.osdetector"
127
id "com.google.protobuf"
138
id "ru.vyarus.animalsniffer"
149
}
1510

1611
description = "gRPC: S2A"
1712

18-
apply plugin: "com.google.osdetector"
19-
2013
dependencies {
2114

2215
api project(':grpc-api')
2316
implementation project(':grpc-stub'),
2417
project(':grpc-protobuf'),
2518
project(':grpc-core'),
2619
libraries.protobuf.java,
27-
libraries.conscrypt,
2820
libraries.guava.jre // JRE required by protobuf-java-util from grpclb
2921
def nettyDependency = implementation project(':grpc-netty')
3022
compileOnly libraries.javax.annotation
@@ -36,12 +28,7 @@ dependencies {
3628
project(':grpc-testing'),
3729
project(':grpc-testing-proto'),
3830
testFixtures(project(':grpc-core')),
39-
libraries.guava,
40-
libraries.junit,
41-
libraries.mockito.core,
42-
libraries.truth,
43-
libraries.conscrypt,
44-
libraries.netty.transport.epoll
31+
libraries.guava
4532

4633
testImplementation 'com.google.truth:truth:1.4.2'
4734
testImplementation 'com.google.truth.extensions:truth-proto-extension:1.4.2'
@@ -74,35 +61,10 @@ dependencies {
7461
classifier = "windows-x86_64"
7562
}
7663
}
77-
testRuntimeOnly (libraries.netty.transport.epoll) {
78-
artifact {
79-
classifier = "linux-x86_64"
80-
}
81-
}
8264

8365
signature libraries.signature.java
8466
}
8567

86-
tasks.named("compileJava") {
87-
dependsOn(tasks.named("generateProto"))
88-
//dependsOn(tasks.named("syncGeneratedSourcesmain"))
89-
}
90-
91-
92-
tasks.named("sourcesJar") {
93-
dependsOn(tasks.named("generateProto"))
94-
//dependsOn(tasks.named("syncGeneratedSourcesmain"))
95-
}
96-
97-
sourceSets {
98-
main {
99-
//java.srcDirs += "src/generated/main/java"
100-
//java.srcDirs += "src/generated/main/grpc"
101-
}
102-
}
103-
//println sourceSets.main.java.srcDirs
104-
//println sourceSets.test.resources.srcDirs
105-
10668
configureProtoCompilation()
10769

10870
tasks.named("javadoc").configure {

0 commit comments

Comments
 (0)