diff options
| author | Albin <albin@mullvad.net> | 2024-03-12 08:05:42 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-03-12 08:05:42 +0100 |
| commit | 2df44a8aaa1c4673d666941a2fa3aa6afc2bfa37 (patch) | |
| tree | 8c4cc3f0a99310eaf58585a91f686efe69c0cb49 /android/app | |
| parent | 1c6d12ffbc5584044e2d2f1bd9056a00f4654384 (diff) | |
| parent | 10d01230b4043fc76149efc3b49ff70a234bbee3 (diff) | |
| download | mullvadvpn-2df44a8aaa1c4673d666941a2fa3aa6afc2bfa37.tar.xz mullvadvpn-2df44a8aaa1c4673d666941a2fa3aa6afc2bfa37.zip | |
Merge branch 'bump-android-dependencies'
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/build.gradle.kts | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 5a82ae7284..750b98aa67 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -33,7 +33,7 @@ android { compileSdk = Versions.Android.compileSdkVersion defaultConfig { - val localProperties = gradleLocalProperties(rootProject.projectDir) + val localProperties = gradleLocalProperties(rootProject.projectDir, providers) applicationId = "net.mullvad.mullvadvpn" minSdk = Versions.Android.minSdkVersion @@ -114,7 +114,7 @@ android { sourceSets { getByName("main") { val changelogDir = - gradleLocalProperties(rootProject.projectDir) + gradleLocalProperties(rootProject.projectDir, providers) .getOrDefault("OVERRIDE_CHANGELOG_DIR", defaultChangelogAssetsDirectory) assets.srcDirs(extraAssetsDirectory, changelogDir) @@ -181,13 +181,13 @@ android { applicationVariants.configureEach { val alwaysShowChangelog = - gradleLocalProperties(rootProject.projectDir).getProperty("ALWAYS_SHOW_CHANGELOG") + gradleLocalProperties(rootProject.projectDir, providers).getProperty("ALWAYS_SHOW_CHANGELOG") ?: "false" buildConfigField("boolean", "ALWAYS_SHOW_CHANGELOG", alwaysShowChangelog) val enableInAppVersionNotifications = - gradleLocalProperties(rootProject.projectDir) + gradleLocalProperties(rootProject.projectDir, providers) .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") ?: "true" @@ -304,13 +304,6 @@ afterEvaluate { play { serviceAccountCredentials.set(file("play-api-key.json")) } -configurations.all { - resolutionStrategy { - // Hold back emoji2 since newer versions require api level 34 which is not yet stable. - force("androidx.emoji2:emoji2:1.3.0") - } -} - dependencies { implementation(project(Dependencies.Mullvad.vpnService)) implementation(project(Dependencies.Mullvad.tileService)) |