0.1.9

Author: tonsky

Diff for: README.md

@@ -38,7 +38,7 @@ with following content:
 uberdeps/deps.edn:
 
 ```clojure
-{:deps {uberdeps {:mvn/version "0.1.8"}}}
+{:deps {uberdeps {:mvn/version "0.1.9"}}}
 ```
 
 uberdeps/package.sh:
@@ -102,7 +102,7 @@ deps.edn:
   ...
   :aliases {
     :uberdeps {
-      :deps {uberdeps {:mvn/version "0.1.8"}}
+      :deps {uberdeps {:mvn/version "0.1.9"}}
       :main-opts ["-m" "uberdeps.uberjar"]
     }
   }
@@ -129,14 +129,14 @@ You can invoke Uberdeps from command line at any time without any prior setup.
 Add to your bash aliases:
 
 ```sh
-clj -Sdeps '{:deps {uberdeps {:mvn/version "0.1.8"}}}' -m uberdeps.uberjar
+clj -Sdeps '{:deps {uberdeps {:mvn/version "0.1.9"}}}' -m uberdeps.uberjar
 ```
 
 Or add to your `~/.clojure/deps.edn`:
 
 ```clojure
 :aliases {
-  :uberjar {:deps {uberdeps {:mvn/version "0.1.8"}}
+  :uberjar {:deps {uberdeps {:mvn/version "0.1.9"}}
             :main-opts ["-m" "uberdeps.uberjar"]}
 }
 ```
@@ -196,7 +196,7 @@ Supported command-line options are:
 --aliases <alias:alias:...>       Colon-separated list of alias names to include from deps file. Defaults to nothing
 --target <file>                   Jar file to ouput to. Defaults to 'target/<directory-name>.jar'
 --main-class <ns>                 Main class, if it exists (e.g. app.core)
---multi-release (true|false)      Add a multi-release flag to the manifest. Defaults to false.
+--multi-release                   Add Multi-Release: true to the manifest. Off by default.
 --level (debug|info|warn|error)   Verbose level. Defaults to debug
 ```
 
@@ -214,13 +214,18 @@ Supported command-line options are:
 
 ## Changelog
 
+### 0.1.9 - Mar 31, 2020
+
+- `--multi-release` / `:multi-release?` added #22 #23 thx @gavinkflam
+- tools.deps updated to 0.8.677
+
 ### 0.1.8 - Jan 13, 2020
 
 - Resolve `:paths` relative to `deps.edn` location
 
 ### 0.1.7 - Dec 20, 2019
 
-- --main-class / :main-class option added #13 #18 thx @gnarroway
+- `--main-class` / `:main-class` option added #13 #18 thx @gnarroway
 - tools.deps updated to 0.8.599
 
 ### 0.1.6 - Oct 4, 2019
@@ -253,6 +258,6 @@ Supported command-line options are:
 
 ## License
 
-Copyright © 2019 Nikita Prokopov
+Copyright © 2019 Nikita Prokopov.
 
 Licensed under MIT (see [LICENSE](LICENSE)).

Diff for: deps.edn

@@ -1,3 +1,3 @@
 {:deps
  {org.clojure/clojure {:mvn/version "1.10.1"}
-  org.clojure/tools.deps.alpha {:mvn/version "0.8.599"}}}
+  org.clojure/tools.deps.alpha {:mvn/version "0.8.677"}}}

Diff for: project.clj

@@ -1,4 +1,4 @@
-(defproject uberdeps "0.1.8"
+(defproject uberdeps "0.1.9"
   :description "Uberjar builder for deps.edn"
   :license     {:name "MIT" :url "https://github.com/tonsky/uberdeps/blob/master/LICENSE"}
   :url         "https://github.com/tonsky/uberdeps"

Diff for: src/uberdeps/api.clj

@@ -112,14 +112,10 @@
 (defn package-manifest
   [opts out]
   (let [manifest (str "Manifest-Version: 1.0\n"
-                   (format "Created-By: %s (%s)\n"
-                           (System/getProperty "java.version")
-                           (System/getProperty "java.vm.vendor"))
-                   (if-let [main-class (:main-class opts)]
+                   "Created-By: " (System/getProperty "java.version") " (" (System/getProperty "java.vm.vendor") ")\n"
+                   (when-some [main-class (:main-class opts)]
                      (format "Main-Class: %s\n" main-class))
-                   ; Indicate that we are generating a multi-release JAR.
-                   ; https://openjdk.java.net/jeps/238
-                   (if-let [multi-release (:multi-release opts)]
+                   (when (:multi-release? opts)
                      (format "Multi-Release: true\n")))
         in       (io/input-stream (.getBytes manifest))]
     (copy-stream in "META-INF/MANIFEST.MF" (FileTime/from (Instant/now)) out)))

Diff for: src/uberdeps/uberjar.clj

@@ -7,26 +7,36 @@
    [clojure.tools.deps.alpha.util.dir :as deps.dir]))
 
 
-(defn -main [& {:as args}]
-  (let [deps-file  (or (get args "--deps-file") "deps.edn")
-        deps-dir   (-> (io/file deps-file) (.getCanonicalFile) (.getParentFile))
-        target     (or (get args "--target")
-                     (as-> (io/file ".") %
-                       (.getCanonicalFile %)
-                       (.getName %)
-                       (str "target/" % ".jar")))
-        aliases    (-> (or (get args "--aliases") "")
-                     (str/split  #":")
-                     (->> (remove str/blank?)
-                       (map keyword)
-                       (into #{})))
-        main-attrs {:main-class    (get args "--main-class")
-                    :multi-release (= (get args "--multi-release") "true")}
-        level      (keyword (or (get args "--level") "debug"))]
+(defn get-option-value [args option]
+  (->> args (drop-while #(not= % option)) second))
+
+
+(defn get-option [args option]
+  (some #(= option %) args))
+
+
+(defn -main [& args]
+  (let [deps-file (or (get-option-value args "--deps-file") "deps.edn")
+        deps-dir  (-> (io/file deps-file) (.getCanonicalFile) (.getParentFile))
+        target    (or (get-option-value args "--target")
+                    (as-> (io/file ".") %
+                      (.getCanonicalFile %)
+                      (.getName %)
+                      (str "target/" % ".jar")))
+        aliases   (-> (or (get-option-value args "--aliases") "")
+                    (str/split  #":")
+                    (->> (remove str/blank?)
+                      (map keyword)
+                      (into #{})))
+        opts      {:main-class     (get-option-value args "--main-class")
+                   :multi-release? (get-option args "--multi-release")
+                   :aliases        aliases}
+        level     (or (some-> (get-option-value args "--level") keyword)
+                    :debug)]
     (binding [api/level level]
       (deps.dir/with-dir deps-dir 
         (api/package
           (edn/read-string (slurp deps-file))
           target
-          (assoc main-attrs :aliases aliases))))
+          opts)))
     (shutdown-agents)))

Diff for: test/multi_release.edn

@@ -0,0 +1,4 @@
+; see https://github.com/tonsky/uberdeps/issues/22
+{:deps
+ {org.apache.logging.log4j/log4j-api {:mvn/version "2.13.1"}
+  org.apache.logging.log4j/log4j-core {:mvn/version "2.13.1"}}}