Merge pull request #492 from ContainerSolutions/bug/cli-install-fix

Gradle install now works
ContainerSolutions · Aug 5, 2016 · 55f99d6 · 55f99d6
2 parents f957d9e + 3ce285a
commit 55f99d6
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/cli/build.gradle b/cli/build.gradle
@@ -21,10 +21,9 @@ ext {
     imageName = imagePrefix + '/minimesos-cli'
 }
 
-task executableJar(type: Jar) {
+jar {
     baseName = "minimesos-cli"
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
     manifest {
         attributes(
                 'Main-Class': mainClassName,
@@ -35,11 +34,11 @@ task executableJar(type: Jar) {
 }
 
 artifacts {
-    archives executableJar
+    archives jar
 }
 
 task copyFilesForDocker(type: Copy) {
-    dependsOn 'executableJar'
+    dependsOn 'jar'
     from "build/libs/minimesos-cli-${project.version}.jar"
     into 'build/docker'
     rename { String fileName ->
@@ -103,4 +102,4 @@ afterEvaluate { project ->
     }
 }
 
-assemble.dependsOn executableJar
+assemble.dependsOn jar