From d927a2b4eb405af6bb127939b0cfdc459c28ba6a Mon Sep 17 00:00:00 2001
From: Andreas Stefl <stefl.andreas@gmail.com>
Date: Sun, 19 Jan 2025 13:11:10 +0100
Subject: [PATCH 1/4] allow passing deployer

---
 build.gradle.kts                                     |  2 +-
 src/main/kotlin/app/opendocument/ConanInstallTask.kt | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c900d2c..acfac19 100644
--- 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
index 519637b..9c3641f 100644
--- a/src/main/kotlin/app/opendocument/ConanInstallTask.kt
+++ b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
@@ -46,11 +46,19 @@ 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")
         conanfile.convention(".")
         conanExecutable.convention("conan")
+        deployer.convention(null)
+        deployerFolder.convention(null)
     }
 
     @get:OutputDirectory
@@ -68,6 +76,8 @@ abstract class ConanInstallTask : Exec() {
             "--profile:host=" + profile.get(),
             "--profile:build=" + buildProfile.get(),
             "--settings:host", "arch=" + arch.get(),
+            deployer.get()?.let { "--deployer=$it" },
+            deployerFolder.get()?.let { "--deployer-folder=$it" },
         )
         super.exec()
 

From 7c1af115278dadd4d4c472ad4d803517db22b99f Mon Sep 17 00:00:00 2001
From: Andreas Stefl <stefl.andreas@gmail.com>
Date: Sun, 19 Jan 2025 13:15:38 +0100
Subject: [PATCH 2/4] fix

---
 .../app/opendocument/ConanInstallTask.kt       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/app/opendocument/ConanInstallTask.kt b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
index 9c3641f..dde4e9c 100644
--- a/src/main/kotlin/app/opendocument/ConanInstallTask.kt
+++ b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
@@ -68,17 +68,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(),
-            deployer.get()?.let { "--deployer=$it" },
-            deployerFolder.get()?.let { "--deployer-folder=$it" },
+            "--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:

From c80106ec23b0086d8f20a54fae42b2bbe18dfd0e Mon Sep 17 00:00:00 2001
From: Andreas Stefl <stefl.andreas@gmail.com>
Date: Sun, 19 Jan 2025 13:21:20 +0100
Subject: [PATCH 3/4] fix

---
 src/main/kotlin/app/opendocument/ConanInstallTask.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/app/opendocument/ConanInstallTask.kt b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
index dde4e9c..6e46392 100644
--- a/src/main/kotlin/app/opendocument/ConanInstallTask.kt
+++ b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
@@ -47,10 +47,10 @@ abstract class ConanInstallTask : Exec() {
     abstract val conanExecutable: Property<String>
 
     @get:Input
-    abstract val deployer: Property<String>
+    abstract val deployer: Property<String?>
 
     @get:Input
-    abstract val deployerFolder: Property<String>
+    abstract val deployerFolder: Property<String?>
 
     init {
         profile.convention("default")

From a88e769098275eaf8468f27792e31e49fe0a3b23 Mon Sep 17 00:00:00 2001
From: Andreas Stefl <stefl.andreas@gmail.com>
Date: Sun, 19 Jan 2025 13:26:45 +0100
Subject: [PATCH 4/4] fix

---
 src/main/kotlin/app/opendocument/ConanInstallTask.kt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/kotlin/app/opendocument/ConanInstallTask.kt b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
index 6e46392..762093f 100644
--- a/src/main/kotlin/app/opendocument/ConanInstallTask.kt
+++ b/src/main/kotlin/app/opendocument/ConanInstallTask.kt
@@ -57,8 +57,6 @@ abstract class ConanInstallTask : Exec() {
         buildProfile.convention("default")
         conanfile.convention(".")
         conanExecutable.convention("conan")
-        deployer.convention(null)
-        deployerFolder.convention(null)
     }
 
     @get:OutputDirectory