diff options
| author | Albin <albin@mullvad.net> | 2023-08-03 15:35:41 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-08-03 15:35:41 +0200 |
| commit | ee9cc04e984e77c83405fd161b35f946adfc538f (patch) | |
| tree | 6238e54a21d8ee7e5917a3f64a6868ddf9b24264 /android/app | |
| parent | 28e71efe1c4303e6f665f2ae79b63d25d68b7241 (diff) | |
| parent | 0a2c48a0c24c3c41e339e620c1e8e7b079ffc6e0 (diff) | |
| download | mullvadvpn-ee9cc04e984e77c83405fd161b35f946adfc538f.tar.xz mullvadvpn-ee9cc04e984e77c83405fd161b35f946adfc538f.zip | |
Merge branch 'bump-container-image-jdk-gradle-and-agp-droid-244'
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/build.gradle.kts | 10 | ||||
| -rw-r--r-- | android/app/lint-baseline.xml | 15 |
2 files changed, 21 insertions, 4 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 1d467ddccd..f257d862d7 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -107,8 +107,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { @@ -203,6 +203,12 @@ tasks.create("printVersion") { } } +afterEvaluate { + tasks.withType(com.android.build.gradle.internal.lint.AndroidLintAnalysisTask::class.java) { + mustRunAfter(tasks.getByName("copyExtraAssets")) + } +} + play { serviceAccountCredentials.set(file("play-api-key.json")) } diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml index 47d84f2ef2..9df8e041a9 100644 --- a/android/app/lint-baseline.xml +++ b/android/app/lint-baseline.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<issues format="6" by="lint 7.4.2" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.2)" variant="all" version="7.4.2"> +<issues format="6" by="lint 8.0.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.2)" variant="all" version="8.0.2"> <issue id="MissingSuperCall" @@ -25,7 +25,18 @@ <issue id="ScopedStorage" - message="WRITE_EXTERNAL_STORAGE no longer provides write access when targeting Android 10+" + message="READ_EXTERNAL_STORAGE is deprecated (and is not granted) when targeting Android 13+. If you need to query or interact with MediaStore or media files on the shared storage, you should instead use one or more new storage permissions: `READ_MEDIA_IMAGES`, `READ_MEDIA_VIDEO` or `READ_MEDIA_AUDIO`." + errorLine1=" <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="src/debug/AndroidManifest.xml" + line="4" + column="36"/> + </issue> + + <issue + id="ScopedStorage" + message="WRITE_EXTERNAL_STORAGE is deprecated (and is not granted) when targeting Android 13+. If you need to write to shared storage, use the `MediaStore.createWriteRequest` intent." errorLine1=" <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> <location |