Merge pull request #52 from pmonks/dev

Release 2.0.217

.github/workflows/docs.yml

@@ -30,7 +30,7 @@ jobs:
         run: clojure -Srepro -J-Dclojure.main.report=stderr -T:build docs
 
       - name: Deploy docs
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           keep_files: true    # Required so that we don't clobber the NVD report (published separately)

README.md

@@ -151,7 +151,7 @@ Other invocation possibilities:
 
 <img alt="Example output from licenses task, explain sub-task" src="demo-licenses-explain.png" width="75%"/>
 
-If you see `Unidentified (<some text>)` licenses in the output, **[please raise an issue here](https://github.com/pmonks/lice-comb/issues/new?assignees=pmonks&labels=unknown+licenses&template=Unknown_licenses.md)**.
+If you see `Unidentified (<some text>)` licenses in the output, but the license is listed in the [SPDX license list](https://spdx.org/licenses/), **[please raise an issue here](https://github.com/pmonks/lice-comb/issues/new?assignees=pmonks&labels=unknown+licenses&template=Unknown_licenses.md)**.
 
 #### `check-asf-policy` task
 

deps.edn

@@ -19,8 +19,8 @@
 {:deps
    {jansi-clj/jansi-clj                 {:mvn/version "1.0.3"}
     com.github.pmonks/clj-wcwidth       {:mvn/version "1.0.85"}
-    com.github.pmonks/lice-comb         {:mvn/version "2.0.272"}
-    com.github.pmonks/asf-cat           {:mvn/version "2.0.129"}
+    com.github.pmonks/lice-comb         {:mvn/version "2.0.279"}
+    com.github.pmonks/asf-cat           {:mvn/version "2.0.131"}
     com.github.pmonks/tools-convenience {:mvn/version "1.0.151"}}
  :aliases
    {:build {:deps       {com.github.pmonks/pbr            {:mvn/version "RELEASE"}

src/tools_licenses/tasks.clj

@@ -33,6 +33,8 @@
             [lice-comb.deps          :as lcd]
             [lice-comb.files         :as lcf]
             [lice-comb.utils         :as lcu]
+            [lice-comb.maven         :as lcmvn]
+            [lice-comb.impl.utils    :as lcim]  ;####TODO: reconsider this
             [asf-cat.api             :as asf]))
 
 (ansi/install!)
@@ -227,8 +229,12 @@
   Note: has the side effect of 'prepping' your project with its transitive
   dependencies (i.e. downloading them if they haven't already been downloaded)."
   [opts]
-  (let [lib-map     (prep-project)
-        output-type (get opts :output :summary)]
+  (let [lib-map      (prep-project)
+        output-type  (get opts :output :summary)
+        local-repo   (:mvn/local-repo lib-map)
+        _            (when-not (s/blank? local-repo) (lcmvn/set-local-maven-repo! local-repo))
+        remote-repos (:mvn/repos lib-map)
+        _            (when-not (empty? remote-repos) (lcmvn/set-remote-maven-repos! (merge lcmvn/default-remote-maven-repos (lcim/mapfonv :url remote-repos))))]
     (if (= :explain output-type)
       ; Handle :output :explain separately, as it only needs license info for a single dependency, not all of them
       (let [dep-ga        (get opts :dep)