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/lib | |
| 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/lib')
| -rw-r--r-- | android/lib/common/build.gradle.kts | 4 | ||||
| -rw-r--r-- | android/lib/common/lint-baseline.xml | 2 | ||||
| -rw-r--r-- | android/lib/endpoint/build.gradle.kts | 4 | ||||
| -rw-r--r-- | android/lib/ipc/build.gradle.kts | 4 | ||||
| -rw-r--r-- | android/lib/model/build.gradle.kts | 4 | ||||
| -rw-r--r-- | android/lib/resource/build.gradle.kts | 4 | ||||
| -rw-r--r-- | android/lib/resource/lint-baseline.xml | 2 | ||||
| -rw-r--r-- | android/lib/talpid/build.gradle.kts | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/android/lib/common/build.gradle.kts b/android/lib/common/build.gradle.kts index 4cc1dfe49c..a0439a829d 100644 --- a/android/lib/common/build.gradle.kts +++ b/android/lib/common/build.gradle.kts @@ -14,8 +14,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { jvmTarget = Versions.jvmTarget } diff --git a/android/lib/common/lint-baseline.xml b/android/lib/common/lint-baseline.xml index 64b3ac2da0..141342d165 100644 --- a/android/lib/common/lint-baseline.xml +++ b/android/lib/common/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="QueryAllPackagesPermission" diff --git a/android/lib/endpoint/build.gradle.kts b/android/lib/endpoint/build.gradle.kts index d7413f3b72..02ef2d2064 100644 --- a/android/lib/endpoint/build.gradle.kts +++ b/android/lib/endpoint/build.gradle.kts @@ -14,8 +14,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { diff --git a/android/lib/ipc/build.gradle.kts b/android/lib/ipc/build.gradle.kts index 718b26ef9a..0c4d6f9127 100644 --- a/android/lib/ipc/build.gradle.kts +++ b/android/lib/ipc/build.gradle.kts @@ -15,8 +15,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts index 0efad3b31f..7368c28069 100644 --- a/android/lib/model/build.gradle.kts +++ b/android/lib/model/build.gradle.kts @@ -14,8 +14,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { diff --git a/android/lib/resource/build.gradle.kts b/android/lib/resource/build.gradle.kts index 0457e2f3db..ea2d52ee24 100644 --- a/android/lib/resource/build.gradle.kts +++ b/android/lib/resource/build.gradle.kts @@ -14,8 +14,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { diff --git a/android/lib/resource/lint-baseline.xml b/android/lib/resource/lint-baseline.xml index 96809601b9..81140b098e 100644 --- a/android/lib/resource/lint-baseline.xml +++ b/android/lib/resource/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="MissingQuantity" diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts index 715ba23b88..c57ff8010c 100644 --- a/android/lib/talpid/build.gradle.kts +++ b/android/lib/talpid/build.gradle.kts @@ -14,8 +14,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { |