diff options
| -rw-r--r-- | android/app/build.gradle.kts | 8 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Versions.kt | 4 | ||||
| -rw-r--r-- | android/gradle.properties | 1 | ||||
| -rw-r--r-- | android/gradle/wrapper/gradle-wrapper.properties | 4 | ||||
| -rw-r--r-- | android/test/e2e/build.gradle.kts | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 5a82ae7284..c73b3d828f 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" diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index b162acaa50..7bd937f6b0 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -46,8 +46,8 @@ object Versions { // The androidAapt plugin version must be in sync with the android plugin version. // Required for Gradle metadata verification to work properly, see: // https://github.com/gradle/gradle/issues/19228 - const val android = "8.2.1" - const val androidAapt = "$android-10154469" + const val android = "8.3.0" + const val androidAapt = "$android-10880808" const val playPublisher = "3.9.0" const val dependencyCheck = "9.0.9" const val detekt = "1.23.5" diff --git a/android/gradle.properties b/android/gradle.properties index 912e0912ff..74c277e3a1 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -3,4 +3,3 @@ android.nonTransitiveRClass=false android.useAndroidX=true kotlin.code.style=official org.gradle.jvmargs=-Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M" -android.experimental.lint.version=8.3.0-beta02 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e6919610b9..94abb13345 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip # Retrieved from: https://gradle.org/release-checksums/ -distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1 +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c diff --git a/android/test/e2e/build.gradle.kts b/android/test/e2e/build.gradle.kts index 7d9a78cda6..161e73b510 100644 --- a/android/test/e2e/build.gradle.kts +++ b/android/test/e2e/build.gradle.kts @@ -33,7 +33,7 @@ android { fun MutableMap<String, String>.addOptionalPropertyAsArgument(name: String) { val value = rootProject.properties.getOrDefault(name, null) as? String - ?: gradleLocalProperties(rootProject.projectDir).getProperty(name) + ?: gradleLocalProperties(rootProject.projectDir, providers).getProperty(name) if (value != null) { put(name, value) |