summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2022-09-03 14:53:31 +0200
committerAlbin <albin@mullvad.net>2022-09-03 15:00:57 +0200
commitc852ce6bf139f8ca711c28073c73dfedcba5f528 (patch)
treefe816ef9c271dc104e90f03c45ff027af738d1f5 /android
parent32723159d1d1a9ea6c0275cf31025ef5786b55d4 (diff)
downloadmullvadvpn-c852ce6bf139f8ca711c28073c73dfedcba5f528.tar.xz
mullvadvpn-c852ce6bf139f8ca711c28073c73dfedcba5f528.zip
Prepare aapt for generating gradle checksums
Diffstat (limited to 'android')
-rw-r--r--android/build.gradle.kts6
-rw-r--r--android/buildSrc/src/main/kotlin/Dependencies.kt3
-rw-r--r--android/buildSrc/src/main/kotlin/Versions.kt1
3 files changed, 10 insertions, 0 deletions
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 5da21f649a..8fa2df4dbe 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -17,6 +17,12 @@ buildscript {
classpath(Dependencies.Plugin.playPublisher)
classpath(Dependencies.Plugin.kotlin)
classpath(Dependencies.Plugin.dependencyCheck)
+
+ // Required for Gradle metadata verification to work properly, see:
+ // https://github.com/gradle/gradle/issues/19228
+ classpath(Dependencies.Plugin.aaptLinux)
+ classpath(Dependencies.Plugin.aaptOsx)
+ classpath(Dependencies.Plugin.aaptWindows)
}
}
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index 38d5b8ddbd..300ffb7dd9 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -81,6 +81,9 @@ object Dependencies {
}
object Plugin {
+ const val aaptLinux = "com.android.tools.build:aapt2:${Versions.Plugin.aapt}:linux"
+ const val aaptOsx = "com.android.tools.build:aapt2:${Versions.Plugin.aapt}:osx"
+ const val aaptWindows = "com.android.tools.build:aapt2:${Versions.Plugin.aapt}:windows"
const val android = "com.android.tools.build:gradle:${Versions.Plugin.android}"
const val androidApplicationId = "com.android.application"
const val androidTestId = "com.android.test"
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index fcdf7573e7..75e963078d 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -41,6 +41,7 @@ object Versions {
}
object Plugin {
+ const val aapt = "4.2.2-7147631"
const val android = "4.2.2"
const val playPublisher = "2.7.5"
const val kotlin = "1.5.32"