defaults; version bump

opendocument-app · Jan 19, 2025 · e9ace08 · e9ace08
1 parent baa9139
commit e9ace08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -32,7 +32,7 @@ kotlin {
 }
 
 group = "app.opendocument"
-version = "0.9.4"
+version = "0.9.5"
 
 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
@@ -49,16 +49,12 @@ abstract class ConanInstallTask : Exec() {
     @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 as String?)
-        deployerFolder.convention(null as String?)
     }
 
     @get:OutputDirectory
@@ -67,6 +63,9 @@ abstract class ConanInstallTask : Exec() {
     @get:OutputFile
     val conanToolchainFile: Provider<RegularFile> = arch.map { project.layout.buildDirectory.get().file("conan/$it/conan_toolchain.cmake") }
 
+    @get:OutputDirectory
+    val deployerFolder: Property<String> = arch.map { project.layout.buildDirectory.get().dir("conan/$it/assets") }
+
     override fun exec() {
         val args = mutableListOf(
             conanExecutable.get(),
@@ -78,8 +77,10 @@ abstract class ConanInstallTask : Exec() {
             "--settings:host", "arch=${arch.get()}"
         )
 
-        deployer.getOrNull()?.let { args.add("--deployer=$it") }
-        deployerFolder.getOrNull()?.let { args.add("--deployer-folder=$it") }
+        if (deployer.isPresent()) {
+            args.add("--deployer=${deployer.get()}")
+            args.add("--deployer-folder=${deployerFolder.get()}")
+        }
 
         commandLine(args)