diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-06-17 15:50:55 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-06-17 15:50:55 +0200 |
| commit | c0d328c74e842d7cdacea5323fc3ec749f457037 (patch) | |
| tree | e294acc68f924a04a32c5b31fd8b7da9d375e857 /android/lib | |
| parent | 55e2277abc4092413f4af01e0c6587aee1138ff4 (diff) | |
| download | mullvadvpn-c0d328c74e842d7cdacea5323fc3ec749f457037.tar.xz mullvadvpn-c0d328c74e842d7cdacea5323fc3ec749f457037.zip | |
Fix issues with protoc and protoc-java verification
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/daemon-grpc/build.gradle.kts | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/android/lib/daemon-grpc/build.gradle.kts b/android/lib/daemon-grpc/build.gradle.kts index ed33aa4d09..ff5d75aa16 100644 --- a/android/lib/daemon-grpc/build.gradle.kts +++ b/android/lib/daemon-grpc/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id(Dependencies.Plugin.androidLibraryId) id(Dependencies.Plugin.kotlinAndroidId) id(Dependencies.Plugin.kotlinParcelizeId) - id(Dependencies.Plugin.protobufId) version Versions.Plugin.protobuf + id(Dependencies.Plugin.Protobuf.protobufId) version Versions.Plugin.protobuf id(Dependencies.Plugin.junit5) version Versions.Plugin.junit5 } @@ -35,13 +35,11 @@ android { } protobuf { - protoc { artifact = "com.google.protobuf:protoc:${Versions.Grpc.protobufVersion}" } + protoc { artifact = Dependencies.Plugin.Protobuf.protoc } plugins { - create("java") { artifact = "io.grpc:protoc-gen-grpc-java:${Versions.Grpc.grpcVersion}" } - create("grpc") { artifact = "io.grpc:protoc-gen-grpc-java:${Versions.Grpc.grpcVersion}" } - create("grpckt") { - artifact = "io.grpc:protoc-gen-grpc-kotlin:${Versions.Grpc.grpcKotlinVersion}:jdk8@jar" - } + create("java") { artifact = Dependencies.Plugin.Protobuf.protocGenGrpcJava } + create("grpc") { artifact = Dependencies.Plugin.Protobuf.protocGenGrpcJava } + create("grpckt") { artifact = Dependencies.Plugin.Protobuf.protocGenGrpcKotlin } } generateProtoTasks { all().forEach { |