Allow passing deployer (#9)

opendocument-app · Jan 19, 2025 · 4fe3604 · 4fe3604
1 parent 2533c4e
commit 4fe3604
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -32,7 +32,7 @@ kotlin {
 }
 
 group = "app.opendocument"
-version = "0.9.3"
+version = "0.9.4"
 
 gradlePlugin {
     website = "https://github.com/opendocument-app/ConanAndroidGradlePlugin"

diff --git a/src/main/kotlin/app/opendocument/ConanInstallTask.kt b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
@@ -46,6 +46,12 @@ abstract class ConanInstallTask : Exec() {
     @get:Input
     abstract val conanExecutable: Property<String>
 
+    @get:Input
+    abstract val deployer: Property<String?>
+
+    @get:Input
+    abstract val deployerFolder: Property<String?>
+
     init {
         profile.convention("default")
         buildProfile.convention("default")
@@ -60,15 +66,21 @@ abstract class ConanInstallTask : Exec() {
     val conanToolchainFile: Provider<RegularFile> = arch.map { project.layout.buildDirectory.get().file("conan/$it/conan_toolchain.cmake") }
 
     override fun exec() {
-        commandLine(
+        val args = mutableListOf(
             conanExecutable.get(),
             "install", conanfile.get(),
-            "--output-folder=" + outputDirectory.get(),
+            "--output-folder=${outputDirectory.get()}",
             "--build=missing",
-            "--profile:host=" + profile.get(),
-            "--profile:build=" + buildProfile.get(),
-            "--settings:host", "arch=" + arch.get(),
+            "--profile:host=${profile.get()}",
+            "--profile:build=${buildProfile.get()}",
+            "--settings:host", "arch=${arch.get()}"
         )
+
+        deployer.getOrNull()?.let { args.add("--deployer=$it") }
+        deployerFolder.getOrNull()?.let { args.add("--deployer-folder=$it") }
+
+        commandLine(args)
+
         super.exec()
 
         // conan install creates toolchain in one of two places: