diff options
| author | Albin <albin@mullvad.net> | 2024-02-05 15:45:56 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-02-05 16:23:04 +0100 |
| commit | 17d7efd2895c4cb01e883dbf10d4fd4b172c6c19 (patch) | |
| tree | f7a5e353394535463d455b0b53c6c301df220029 /android | |
| parent | eb0811cb3b03359b14f4be1b872781bb25cb25bd (diff) | |
| download | mullvadvpn-17d7efd2895c4cb01e883dbf10d4fd4b172c6c19.tar.xz mullvadvpn-17d7efd2895c4cb01e883dbf10d4fd4b172c6c19.zip | |
Fix gradle asset task dependency
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/build.gradle.kts | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 8499c03acd..3932e220f5 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -1,8 +1,9 @@ -import Dependencies.Plugin.ksp import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties +import com.android.build.gradle.internal.lint.LintModelWriterTask import com.android.build.gradle.internal.tasks.factory.dependsOn +import com.android.build.gradle.tasks.MergeSourceSetFolders import java.io.FileInputStream -import java.util.* +import java.util.Properties import org.gradle.configurationcache.extensions.capitalized plugins { @@ -142,9 +143,9 @@ android { ) } - tasks.withType<com.android.build.gradle.tasks.MergeSourceSetFolders> { - dependsOn(getTasksByName("copyExtraAssets", true)) - } + tasks.withType<MergeSourceSetFolders> { dependsOn(getTasksByName("copyExtraAssets", true)) } + + tasks.withType<LintModelWriterTask> { dependsOn(getTasksByName("copyExtraAssets", true)) } // Suppressing since we don't seem have much of an option than using this api. The impact should // also be limited to tests. @@ -184,7 +185,8 @@ android { val enableInAppVersionNotifications = gradleLocalProperties(rootProject.projectDir) - .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") ?: "true" + .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") + ?: "true" buildConfigField( "boolean", |