Skip to content

Commit 5061083

Browse files
Make conanInstall task a dependency of Android Studio's sync task
1 parent 6f3a04e commit 5061083

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

app/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tasks.register('conanProfile', Copy) {
2121
}
2222

2323
tasks.register('conanInstall') {
24-
dependsOn(conanProfile)
24+
dependsOn(tasks.named("conanProfile"))
2525
doFirst {
2626
["armv7", "armv8", "x86", "x86_64"].each { String arch ->
2727
exec {
@@ -39,7 +39,9 @@ tasks.register('conanInstall') {
3939
}
4040
}
4141
}
42-
preBuild.dependsOn conanInstall
42+
tasks.named("preBuild").configure { preBuildTask ->
43+
preBuildTask.dependsOn(tasks.named("conanInstall"))
44+
}
4345

4446
android {
4547
defaultConfig {

build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,10 @@ plugins {
33
id 'com.google.gms.google-services'version '4.4.1' apply false
44
id 'com.google.firebase.crashlytics' version '3.0.1' apply false
55
}
6+
7+
// Android Studio's sync task expects CMake to work properly
8+
// Proper CMake, due to our supplied conan_toolchain.cmake, requires conan to be
9+
// done as a dependency of Android Studio sync
10+
tasks.named('prepareKotlinBuildScriptModel').configure { prepareKotlinBuildScriptModelTask ->
11+
prepareKotlinBuildScriptModelTask.dependsOn(project("app").tasks.named("conanInstall"))
12+
}

0 commit comments

Comments
 (0)