maint: update clj-kondo (woot!) and lint script

The lint script now follows clj-kondo docs on bringing in config imports.

Author: lread

bb.edn

@@ -14,8 +14,8 @@
          :leave (let [{:keys [name]} (current-task)] (status/line :detail "\nTASK %s done." name))
          ;; commands
          apply-import-vars {:task apply-import-vars/-main :doc "(check|gen-code) - export APIs statically from templates"}
-         lint              {:task lint/-main              :doc "[--rebuild-cache] lint source code using clj-kondo, eastwood, whitespace-linter"}
-         -lint-kondo       {:task lint-kondo/-main        :doc "[--rebuild-cache]"}
+         lint              {:task lint/-main              :doc "[--rebuild] lint source code using clj-kondo, eastwood, whitespace-linter"}
+         -lint-kondo       {:task lint-kondo/-main        :doc "[--rebuild]"}
          -lint-eastwood    {:task lint-eastwood/-main}
          -lint-whitespace  {:task lint-whitespace/-main}
          test-clj          {:task test-clj/-main          :doc "[--clojure-version (1.8|1.9|1.10|1.11)]"}

deps.edn

@@ -21,7 +21,7 @@
            ;;
            :lint-cache {:replace-paths ["src"]} ;; when building classpath we want to exclude resources
                                                 ;; so we do not pick up our own clj-kondo config exports
-           :clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2022.04.25"}}
+           :clj-kondo {:extra-deps {clj-kondo/clj-kondo {:mvn/version "2022.05.27"}}
                        :override-deps {org.clojure/clojure {:mvn/version "1.11.1"}}
                        :main-opts ["-m" "clj-kondo.main"]}
 

doc/02-developer-guide.adoc

@@ -296,7 +296,7 @@ bb lint
 and you can too. The lint script will build the clj-kondo cache when it is missing or stale.
 If you want to force a rebuild of the cache run:
 ----
-bb lint --rebuild-cache
+bb lint --rebuild
 ----
 
 https://github.com/borkdude/clj-kondo/blob/master/doc/editor-integration.md[Integrate clj-kondo into your editor] to catch mistakes as they happen.

script/helper/shell.clj

@@ -19,3 +19,12 @@
                           [nil cmd args])
         opts (merge opts default-opts)]
     (apply tasks/shell opts cmd args)))
+
+(defn clojure
+  "Wrap tasks/clojure for my loud error reporting treatment"
+  [& args]
+  (let [[opts args] (if (map? (first args))
+                      [(first args) (rest args)]
+                      [nil args])
+        opts (merge opts default-opts)]
+    (apply tasks/clojure opts args)))

script/lint_kondo.clj

@@ -18,14 +18,18 @@
     (fs/delete-tree clj-kondo-cache)))
 
 (defn- build-cache []
-  (status/line :detail "Building cache")
   (when (cache-exists?)
     (delete-cache))
-  (let [clj-cp (-> (shell/command {:out :string}
-                                  "clojure -A:test:lint-cache -Spath")
-                   :out string/trim)
+  (let [clj-cp (-> (shell/clojure {:out :string}
+                                  "-Spath -M:test")
+                   with-out-str
+                   string/trim)
         bb-cp (bbcp/get-classpath)]
-    (shell/command "clojure -M:clj-kondo --dependencies --copy-configs --lint" clj-cp bb-cp)))
+
+    (status/line :detail "- copying configs")
+    (shell/command "clojure -M:clj-kondo --skip-lint --copy-configs --lint" clj-cp bb-cp)
+    (status/line :detail "- creating cache")
+    (shell/command "clojure -M:clj-kondo --dependencies --parallel --lint" clj-cp bb-cp)))
 
 (defn- check-cache [{:keys [rebuild-cache]}]
   (status/line :head "clj-kondo: cache check")
@@ -58,12 +62,12 @@
 (def args-usage "Valid args: [options]
 
 Options:
-  --rebuild-cache  Force rebuild of clj-kondo lint cache.
-  --help           Show this help.")
+  --rebuild  Force rebuild of clj-kondo lint cache.
+  --help     Show this help.")
 
 (defn -main [& args]
   (when-let [opts (main/doc-arg-opt args-usage args)]
-    (lint {:rebuild-cache (get opts "--rebuild-cache")})))
+    (lint {:rebuild-cache (get opts "--rebuild")})))
 
 (main/when-invoked-as-script
  (apply -main *command-line-args*))