Fix jar task with jar-inclusions

guns · Feb 1, 2012 · 1c5babe · 1c5babe
1 parent 2f73e7d
commit 1c5babe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/leiningen/jar.clj b/src/leiningen/jar.clj
@@ -158,7 +158,7 @@
             [{:type :paths :paths (:source-path project)}
              {:type :paths :paths (:java-source-path project)}])
           (if-let [jar-inclusions (:jar-inclusions project)]
-            {:type :paths :paths jar-inclusions})
+            [{:type :paths :paths jar-inclusions}])
           ;; (shell-wrapper-filespecs project deps-fileset)
           ))
 

diff --git a/src/leiningen/uberjar.clj b/src/leiningen/uberjar.clj
@@ -81,8 +81,9 @@ as well as defining a -main function."
                      project)
            project (update-in project [:jar-inclusions]
                               concat (:uberjar-inclusions project))]
-       (when (pos? (jar project))
-         (abort "Uberjar aborting because jar/compilation failed.")))
+       (let [res (jar project)]
+         (when (and (number? res) (pos? res))
+           (abort "Uberjar aborting because jar/compilation failed."))))
      (let [standalone-filename (get-jar-filename project :uberjar)]
          (with-open [out (-> standalone-filename
                              (FileOutputStream.)

diff --git a/test/leiningen/test/uberjar.clj b/test/leiningen/test/uberjar.clj
@@ -6,7 +6,7 @@
 
 (deftest test-uberjar
   (let [filename "test_projects/sample_no_aot/target/nomnomnom-0.5.0-SNAPSHOT-standalone.jar"
-        _ (with-out-str (uberjar sample-no-aot-project))
+        _ (uberjar sample-no-aot-project)
         entries (->> (ZipFile. filename)
                     .entries
                     enumeration-seq