summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2024-12-16 20:48:12 +0100
committerDavid Göransson <david.goransson@mullvad.net>2024-12-17 14:57:25 +0100
commit002d517e31d5d9ce7bdc5835c482609fc0bf9c06 (patch)
tree0390e8669dd819331c698e5f4f8974ee015305b9
parente1fde74f1fd86acd50b74b86ead5c7ffa9aaec50 (diff)
downloadmullvadvpn-002d517e31d5d9ce7bdc5835c482609fc0bf9c06.tar.xz
mullvadvpn-002d517e31d5d9ce7bdc5835c482609fc0bf9c06.zip
Add InvalidPackage bug to lint config
Generating it from gradle task will fail on CI due to relative path not being correct.
-rw-r--r--android/config/lint-baseline.xml14
-rw-r--r--android/config/lint.xml4
2 files changed, 4 insertions, 14 deletions
diff --git a/android/config/lint-baseline.xml b/android/config/lint-baseline.xml
index 4e21f5e7b9..92267c4124 100644
--- a/android/config/lint-baseline.xml
+++ b/android/config/lint-baseline.xml
@@ -2,20 +2,6 @@
<issues format="6" by="lint 8.7.3" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.3)" variant="all" version="8.7.3">
<issue
- id="InvalidPackage"
- message="Invalid package reference in library; not included in Android: `javax.naming.directory`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`.">
- <location
- file="../../../root/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.68.2/b0fd51a1c029785d1c9ae2cfc80a296b60dfcfdb/grpc-core-1.68.2.jar"/>
- </issue>
-
- <issue
- id="InvalidPackage"
- message="Invalid package reference in library; not included in Android: `javax.naming`. Referenced from `io.grpc.internal.JndiResourceResolverFactory.JndiRecordFetcher`.">
- <location
- file="../../../root/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.68.2/b0fd51a1c029785d1c9ae2cfc80a296b60dfcfdb/grpc-core-1.68.2.jar"/>
- </issue>
-
- <issue
id="SimilarGradleDependency"
message="There are multiple dependencies com.google.protobuf but with different version"
errorLine1="protobuf-core = { id = &quot;com.google.protobuf&quot;, version.ref = &quot;protobuf&quot; }"
diff --git a/android/config/lint.xml b/android/config/lint.xml
index a2b65d7bc4..c2ffdf12be 100644
--- a/android/config/lint.xml
+++ b/android/config/lint.xml
@@ -17,4 +17,8 @@
<!-- Temporarily ignored since a dependency is checked with older version of lint -->
<issue id="ObsoleteLintCustomCheck" severity="ignore" />
<issue id="NewerVersionAvailable" severity="ignore" />
+ <!-- Ignored, see more: https://github.com/grpc/grpc-java/blob/e8ff6da2cf57a39a62497e9f317e6976b5bfb98c/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java#L199 -->
+ <issue id="InvalidPackage">
+ <ignore path="**/io.grpc/grpc-core/1.69.0/7dad3419dfb91a77788afcdf79e0477172784910/grpc-core-1.69.0.jar" />
+ </issue>
</lint>