Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies #5938

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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))
Expand Down
36 changes: 18 additions & 18 deletions android/buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
object Versions {
const val commonsValidator = "1.8.0"
const val jodaTime = "2.12.5"
const val junit = "5.10.0"
const val jodaTime = "2.12.7"
const val junit = "5.10.2"
const val jvmTarget = "17"
const val konsist = "0.13.0"
const val konsist = "0.14.0"
const val kotlin = "1.9.22"
const val kotlinCompilerExtensionVersion = "1.5.10"
const val kotlinx = "1.7.3"
const val leakCanary = "2.12"
const val mockk = "1.13.8"
const val kotlinx = "1.8.0"
const val leakCanary = "2.13"
const val mockk = "1.13.10"
const val mockWebserver = "4.12.0"
const val turbine = "1.0.0"
const val billingClient = "6.0.1"
const val billingClient = "6.2.0"

object Android {
const val compileSdkVersion = 34
Expand All @@ -26,7 +26,7 @@ object Versions {
const val coreKtx = "1.12.0"
const val espresso = "3.5.1"
const val lifecycle = "2.7.0"
const val fragment = "1.6.1"
const val fragment = "1.6.2"
const val test = "1.5.0"
const val testMonitor = "1.6.1"
const val testOrchestrator = "1.4.2"
Expand All @@ -35,25 +35,25 @@ object Versions {
}

object Compose {
const val destinations = "1.10.1"
const val base = "1.6.2"
const val destinations = "1.10.2"
const val base = "1.6.3"
const val constrainLayout = "1.0.1"
const val foundation = base
const val material3 = "1.2.0"
const val material3 = "1.2.1"
}

object Plugin {
// 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 playPublisher = "3.8.4"
const val dependencyCheck = "8.3.1"
const val detekt = "1.23.4"
const val gradleVersions = "0.47.0"
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"
const val gradleVersions = "0.51.0"
const val junit5 = "1.10.0.0"
const val ktfmt = "0.16.0"
const val ktfmt = "0.17.0"
// Ksp version is linked with kotlin version, find matching release here:
// https://github.com/google/ksp/releases
const val ksp = "${kotlin}-1.0.17"
Expand Down
8 changes: 8 additions & 0 deletions android/config/dependency-check-suppression.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,12 @@
<packageUrl regex="true">^pkg:maven/com\.google\.devtools\.ksp/symbol\-processing.*@.*$</packageUrl>
<cve>CVE-2018-1000840</cve>
</suppress>
<suppress until="2024-09-01Z">
<notes><![CDATA[
False-positive related to Drupal rather than Android development.
https://nvd.nist.gov/vuln/detail/CVE-2014-9152
]]></notes>
<packageUrl regex="true">^pkg:maven/androidx\.test\.services/storage@.*$</packageUrl>
<cve>CVE-2014-9152</cve>
</suppress>
</suppressions>
1 change: 0 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Loading