Merge pull request #365 from opendocument-app/conanplugin

Use ConanAndroidGradlePlugin
opendocument-app · Jul 31, 2024 · 7f58bdb · 7f58bdb
2 parents 014b84a + 5a5dc1b
commit 7f58bdb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 54 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,6 +4,7 @@ plugins {
     id 'com.android.application'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
+    id 'app.opendocument.conanandroidgradleplugin'
 }
 
 android {
@@ -16,56 +17,12 @@ tasks.register('conanProfile', Copy) {
     filter(ReplaceTokens, tokens: ["NDK_PATH": android.ndkDirectory.toString()])
 }
 
-abstract class ConanInstallTask extends Exec {
-    @Input
-    abstract Property<String> getArch()
-
-    // Cannot read project.layout.buildDirectory when configuration-cache is enabled
-    @Input
-    abstract Property<String> getArchBuildDirPath()
-
-    @OutputDirectory
-    final Provider<Directory> outputDirectory = archBuildDirPath.map { new File(it) }
-
-    @Override
-    protected void exec() {
-        commandLine(
-            "conan", "install", ".",
-            "--output-folder=" + archBuildDirPath.get(),
-            "--build=missing",
-            "--profile:host=build/conanprofile.txt",
-            "-s", "arch=" + arch.get(),
-            "-s", "build_type=Release",
-            "-s", "&:build_type=RelWithDebInfo",
-            "-s", "odrcore/*:build_type=RelWithDebInfo",
-        )
-        super.exec()
-    }
-}
-
 ["armv8", "armv7", "x86", "x86_64"].each { architecture ->
-    tasks.register('conanInstall-' + architecture, ConanInstallTask) {
-        setArch(architecture)
-        setArchBuildDirPath(new File(project.layout.buildDirectory.get().toString(), 'conan/' + architecture).absolutePath)
-        dependsOn(tasks.named("conanProfile"))
-
-        // Execute at least one conanInstall before running all three others in parallel.
-        // Some issue with conan's local cache
-        // @TODO: isolate and report to conan-client bugtracker
-        if (architecture != "armv8") {
-            dependsOn(tasks.named("conanInstall-armv8"))
-        }
+    tasks.named("conanInstall-" + architecture) {
+        profile.set('build/conanprofile.txt')
+        dependsOn(tasks.named('conanProfile'))
     }
 }
-tasks.register("conanInstall") {
-    ["armv7", "armv8", "x86", "x86_64"].each { arch ->
-        dependsOn tasks.named('conanInstall-' + arch)
-    }
-}
-
-tasks.named("preBuild").configure { preBuildTask ->
-    preBuildTask.dependsOn(tasks.named("conanInstall"))
-}
 
 android {
     defaultConfig {

diff --git a/app/conanprofile.txt b/app/conanprofile.txt
@@ -7,6 +7,7 @@ compiler=clang
 compiler.version=12
 compiler.cppstd=17
 compiler.libcxx=c++_shared
+build_type=RelWithDebInfo
 
 [conf]
 tools.android:ndk_path=@NDK_PATH@

diff --git a/build.gradle b/build.gradle
@@ -2,11 +2,5 @@ plugins {
     id 'com.android.application' version '8.4.1' apply false
     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"))
+    id 'app.opendocument.conanandroidgradleplugin' version "0.9.0" apply false
 }