fix(UploadBuildInformationTask): fix version and packageName usage

Liftric · May 29, 2020 · fd29586 · fd29586
1 parent 7294ef7
commit fd29586
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ octopus {
     val jar by tasks.existing(Jar::class)
     packageName.set(jar.get().archiveBaseName.get())
     version.set(jar.get().archiveVersion.get())
-    pushPackage.set(jar.get().archiveFile.get())
+    pushPackage.set(jar.get().archiveFile)
 }
 ```
 

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -36,6 +36,6 @@ octopus {
     val jar by tasks.existing(Jar::class)
     packageName.set(jar.get().archiveBaseName.get().removeSuffix("-"))
     version.set(jar.get().archiveVersion.get())
-    pushPackage.set(jar.get().archiveFile.get())
+    pushPackage.set(jar.get().archiveFile)
 
 }
diff --git a/src/integrationTest/kotlin/com/liftric/octopusdeploy/task/UploadBuildInformationTaskTest.kt b/src/integrationTest/kotlin/com/liftric/octopusdeploy/task/UploadBuildInformationTaskTest.kt
@@ -81,7 +81,7 @@ octopus {
     val jar by tasks.existing(Jar::class)
     packageName.set(jar.get().archiveBaseName.get().removeSuffix("-"))
     version.set(jar.get().archiveVersion.get())
-    pushPackage.set(jar.get().archiveFile.get())
+    pushPackage.set(jar.get().archiveFile)
 }
 """
             )

diff --git a/src/integrationTest/kotlin/com/liftric/octopusdeploy/task/UploadPackageTaskTest.kt b/src/integrationTest/kotlin/com/liftric/octopusdeploy/task/UploadPackageTaskTest.kt
@@ -81,7 +81,7 @@ octopus {
     val jar by tasks.existing(Jar::class)
     packageName.set(jar.get().archiveBaseName.get().removeSuffix("-"))
     version.set(jar.get().archiveVersion.get())
-    pushPackage.set(jar.get().archiveFile.get())
+    pushPackage.set(jar.get().archiveFile)
 }
 """
             )

diff --git a/src/main/kotlin/com/liftric/octopusdeploy/OctopusDeployPlugin.kt b/src/main/kotlin/com/liftric/octopusdeploy/OctopusDeployPlugin.kt
@@ -76,8 +76,6 @@ class OctopusDeployPlugin : Plugin<Project> {
                 project.afterEvaluate {
                     apiKey.set(extension.apiKey)
                     octopusUrl.set(extension.serverUrl)
-                    packageName.set(extension.packageName)
-                    task.version.set(extension.version)
                     packageFile.set(extension.pushPackage)
                     overwriteMode = extension.buildInformationOverwriteMode?.name
                 }

diff --git a/src/main/kotlin/com/liftric/octopusdeploy/task/UploadBuildInformationTask.kt b/src/main/kotlin/com/liftric/octopusdeploy/task/UploadBuildInformationTask.kt
@@ -45,8 +45,8 @@ open class UploadBuildInformationTask : DefaultTask() {
             "--file",
             buildInformation?.absolutePath ?: error("couldn't find build-information.json"),
             "--package-id",
-            packageName,
-            "--version=$version",
+            packageName.get(),
+            "--version=${version.get()}",
             overwriteMode?.let { "--overwrite-mode=$it" }
         ).filterNotNull().joinToString(" ").let { shell(it) }
         if (exitCode == 0) {

diff --git a/src/main/kotlin/com/liftric/octopusdeploy/task/UploadPackageTask.kt b/src/main/kotlin/com/liftric/octopusdeploy/task/UploadPackageTask.kt
@@ -24,12 +24,6 @@ open class UploadPackageTask : DefaultTask() {
     @Input
     val apiKey: Property<String> = project.objects.property()
 
-    @Input
-    val packageName: Property<String> = project.objects.property()
-
-    @Input
-    val version: Property<String> = project.objects.property()
-
     @Input
     @Optional
     var overwriteMode: String? = null