Merge pull request #360 from ViliusSutkus89/conanInstallTask

Update conan install tasks in gradle (allows running ./gradlew clean without running conan install)

Author: ViliusSutkus89

.github/workflows/android_main.yml

@@ -50,14 +50,15 @@ jobs:
 
     - name: conan remote
       run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
-    - name: conan login
-      run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
     - name: conan profile
       run: conan profile detect
 
     - name: gradle
       run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace
 
+    - name: conan login
+      run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
+
     - name: upload binaries to conan repo
       run: conan upload "*" --check --confirm --remote odr
 
@@ -118,8 +119,6 @@ jobs:
 
     - name: conan remote
       run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
-    - name: conan login
-      run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
     - name: conan profile
       run: conan profile detect
 
@@ -173,6 +172,9 @@ jobs:
 
           test ! -f sorry_but_tests_are_failing
 
+    - name: conan login
+      run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
+
     - name: upload binaries to conan repo
       run: conan upload "*" --check --confirm --remote odr
 

app/build.gradle

@@ -8,36 +8,40 @@ android {
     ndkVersion "26.3.11579264"
 }
 
-task conanProfile {
-    file("build").mkdirs()
-
-    copy {
-        from "conanprofile.txt"
-        into "build"
+tasks.register('conanProfile', Copy) {
+    from "conanprofile.txt"
+    into "build/"
+
+    doLast {
+        def file = file("build/conanprofile.txt")
+        def content = file.text
+        content = content.replace("<NDK_PATH>", android.ndkDirectory.toString())
+        file.write(content)
     }
-
-    def file = file("build/conanprofile.txt")
-    def content = file.text
-    content = content.replace("<NDK_PATH>", android.ndkDirectory.toString())
-    file.write(content)
 }
 
-task conanInstall {
-    ["armv7", "armv8", "x86", "x86_64"].each { String arch ->
-        exec {
-            commandLine(
-                "conan", "install", ".",
-                "--output-folder=build/conan/" + arch,
-                "--build=missing",
-                "--profile:host=build/conanprofile.txt",
-                "-s", "arch=" + arch,
-                "-s", "build_type=Release",
-                "-s", "&:build_type=RelWithDebInfo",
-                "-s", "odrcore/*:build_type=RelWithDebInfo",
-            )
+tasks.register('conanInstall') {
+    dependsOn(tasks.named("conanProfile"))
+    doFirst {
+        ["armv7", "armv8", "x86", "x86_64"].each { String arch ->
+            exec {
+                commandLine(
+                    "conan", "install", ".",
+                    "--output-folder=build/conan/" + arch,
+                    "--build=missing",
+                    "--profile:host=build/conanprofile.txt",
+                    "-s", "arch=" + arch,
+                    "-s", "build_type=Release",
+                    "-s", "&:build_type=RelWithDebInfo",
+                    "-s", "odrcore/*:build_type=RelWithDebInfo",
+                )
+            }
         }
     }
 }
+tasks.named("preBuild").configure { preBuildTask ->
+    preBuildTask.dependsOn(tasks.named("conanInstall"))
+}
 
 android {
     defaultConfig {
@@ -168,3 +172,11 @@ dependencies {
     implementation 'androidx.test.espresso:espresso-idling-resource:3.5.1'
     implementation 'androidx.annotation:annotation:1.8.0'
 }
+
+// Without removing .cxx dir on cleanup, double gradle clean is erroring out.
+// Before removing this workaround, check if "./gradlew assembleDebug; ./gradlew clean; ./gradlew clean" works
+tasks.named("clean") {
+    doFirst {
+        delete getLayout().getProjectDirectory().dir(".cxx")
+    }
+}

build.gradle

@@ -3,3 +3,10 @@ plugins {
     id 'com.google.gms.google-services'version '4.4.1' apply false
     id 'com.google.firebase.crashlytics' version '3.0.1' apply false
 }
+
+// Android Studio's sync task expects CMake to work properly
+// Proper CMake, due to our supplied conan_toolchain.cmake, requires conan to be
+// done as a dependency of Android Studio sync
+tasks.named('prepareKotlinBuildScriptModel').configure { prepareKotlinBuildScriptModelTask ->
+    prepareKotlinBuildScriptModelTask.dependsOn(project("app").tasks.named("conanInstall"))
+}