vato007/picar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update android dependencies, remove legacy python/swift grpc plugins

Browse Source
This commit is contained in:
Piv
2023-01-22 20:53:49 +10:30
parent 957880f1fb
commit a3060d7e22
12 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
protobuf/build.gradle
View File

@@ -20,22 +20,14 @@ configurations {
}
protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.11.0' }
protoc { artifact = 'com.google.protobuf:protoc:3.21.12' }
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.28.1' // CURRENT_GRPC_VERSION
}
grpc_python {
path = "$projectDir/grpc_plugins/grpc_python_plugin_1.28.1-${osdetector.classifier}"
}
if(osdetector.os != 'windows'){
swift {
path = "$projectDir/grpc_plugins/protoc-gen-swift-$osdetector.classifier"
}
grpc_swift {
path = "$projectDir/grpc_plugins/protoc-gen-grpc-swift-$osdetector.classifier"
}
artifact = 'io.grpc:protoc-gen-grpc-java:1.52.0' // CURRENT_GRPC_VERSION
}
// grpc_python {
// path = "$projectDir/grpc_plugins/grpc_python_plugin_1.28.1-${osdetector.classifier}"
// }
}
generateProtoTasks {
all().each { task ->
@@ -48,15 +40,6 @@ protobuf {
grpc { // Options added to --grpc_out
option 'lite'
}
grpc_python {
outputSubDir = 'python'
}
if(osdetector.os != 'windows'){
swift{}
grpc_swift {
outputSubDir = 'swift'
}
}
}
}
}
@@ -77,7 +60,7 @@ artifacts {
dependencies {
implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION
implementation 'javax.annotation:javax.annotation-api:1.2'
implementation 'io.grpc:grpc-protobuf-lite:1.52.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.52.0' // CURRENT_GRPC_VERSION
implementation 'javax.annotation:javax.annotation-api:1.3.2'
}