diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-10-13 16:19:09 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-10-15 09:12:33 +0200 |
| commit | f81a91208badb65ed938d851246bb3ea5064ad73 (patch) | |
| tree | 6fec0a31eb18928ace6a7f876509e6bea1ebec1a /android | |
| parent | 317706e46eb3a3374d29c3b7c70bf2ceeefd6649 (diff) | |
| download | mullvadvpn-f81a91208badb65ed938d851246bb3ea5064ad73.tar.xz mullvadvpn-f81a91208badb65ed938d851246bb3ea5064ad73.zip | |
Fix similar dependency lint warning
Diffstat (limited to 'android')
| -rw-r--r-- | android/config/lint-baseline.xml | 44 | ||||
| -rw-r--r-- | android/gradle/libs.versions.toml | 5 | ||||
| -rw-r--r-- | android/lib/daemon-grpc/build.gradle.kts | 4 |
3 files changed, 4 insertions, 49 deletions
diff --git a/android/config/lint-baseline.xml b/android/config/lint-baseline.xml index d183b024a9..4b174da34f 100644 --- a/android/config/lint-baseline.xml +++ b/android/config/lint-baseline.xml @@ -15,48 +15,4 @@ file="*/caches/modules-2/files-2.1/io.grpc/grpc-core/1.76.0/44e562312b45d848297b80963fe0f93f5b71589c/grpc-core-1.76.0.jar"/> </issue> - <issue - id="SimilarGradleDependency" - message="There are multiple dependencies com.google.protobuf but with different version" - errorLine1="protobuf-core = { id = "com.google.protobuf", version.ref = "protobuf-gradle-plugin" }" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="../gradle/libs.versions.toml" - line="231" - column="18"/> - </issue> - - <issue - id="SimilarGradleDependency" - message="There are multiple dependencies com.google.protobuf but with different version" - errorLine1="protobuf-protoc = { id = "com.google.protobuf:protoc", version.ref = "protobuf" }" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="../gradle/libs.versions.toml" - line="232" - column="20"/> - </issue> - - <issue - id="SimilarGradleDependency" - message="There are multiple dependencies io.grpc but with different version" - errorLine1="grpc-protoc-gen-grpc-java = { id = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" }" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="../gradle/libs.versions.toml" - line="235" - column="30"/> - </issue> - - <issue - id="SimilarGradleDependency" - message="There are multiple dependencies io.grpc but with different version" - errorLine1="grpc-protoc-gen-grpc-kotlin = { id = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpc-kotlin-jar" }" - errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> - <location - file="../gradle/libs.versions.toml" - line="236" - column="32"/> - </issue> - </issues> diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 1d776125c4..59c174e800 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -49,10 +49,7 @@ drawablepainter = "0.37.3" # Update suppression for 'InvalidPackage' in config/lint.xml grpc = "1.76.0" -# Skipping 1.4.3, possibly a faulty release with no changelog. -# https://github.com/grpc/grpc-kotlin/issues/644 grpc-kotlin = "1.5.0" -grpc-kotlin-jar = "1.5.0:jdk8@jar" junit = "5.13.4" junit5-android = "1.8.0" @@ -238,7 +235,7 @@ protobuf-protoc = { id = "com.google.protobuf:protoc", version.ref = "protobuf" # gRPC grpc-protoc-gen-grpc-java = { id = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" } -grpc-protoc-gen-grpc-kotlin = { id = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpc-kotlin-jar" } +grpc-protoc-gen-grpc-kotlin = { id = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpc-kotlin" } dependency-versions = { id = "com.github.ben-manes.versions", version.ref = "dependency-versions" } diff --git a/android/lib/daemon-grpc/build.gradle.kts b/android/lib/daemon-grpc/build.gradle.kts index 3dde9bf8a8..9ac8450a9e 100644 --- a/android/lib/daemon-grpc/build.gradle.kts +++ b/android/lib/daemon-grpc/build.gradle.kts @@ -60,7 +60,9 @@ protobuf { artifact = libs.plugins.grpc.protoc.gen.grpc.java.get().toString() } } - create("grpckt") { artifact = libs.plugins.grpc.protoc.gen.grpc.kotlin.get().toString() } + create("grpckt") { + artifact = libs.plugins.grpc.protoc.gen.grpc.kotlin.get().toString() + ":jdk8@jar" + } } generateProtoTasks { all().forEach { |