Upgrade development setup

Author: vemv

Diff for: Makefile

@@ -1,6 +1,42 @@
-.PHONY: test deploy clean
-
+.PHONY: test kondo eastwood cljfmt lint deploy clean repl lein-repl
 VERSION ?= 1.11
+HOME=$(shell echo $$HOME)
+HERE=$(shell echo $$PWD)
+
+# This makefile offers high-performance (cached) wrappers that enrich the classpath, for optimal IDE functioning.
+# We suggest that you copy/merge this file into your project.
+# We believe it's best to give you something that you can freely understand and hack locally.
+# The tradeoff is that you may have to catch up with important fixes/improvements to this Makefile, if any.
+# Feel free to suggest any improvements at:
+# https://github.com/clojure-emacs/enrich-classpath/issues
+
+# Set bash instead of sh for the @if [[ conditions,
+# and use the usual safety flags:
+SHELL = /bin/bash -Eeu
+
+# The Lein profiles that will be selected for `lein-repl`.
+# Feel free to upgrade this, or to override it with an env var named LEIN_PROFILES.
+# Expected format: "+dev,+test"
+# Don't use spaces here.
+LEIN_PROFILES ?= "+dev,+test"
+
+# The enrich-classpath version to be injected.
+# Feel free to upgrade this.
+ENRICH_CLASSPATH_VERSION="1.19.0"
+
+# Create and cache a `java` command. project.clj is mandatory; the others are optional but are taken into account for cache recomputation.
+# It's important not to silence with step with @ syntax, so that Enrich progress can be seen as it resolves dependencies.
+.enrich-classpath-lein-repl: Makefile project.clj $(wildcard checkouts/*/project.clj) $(wildcard deps.edn) $(wildcard $(HOME)/.clojure/deps.edn) $(wildcard profiles.clj) $(wildcard $(HOME)/.lein/profiles.clj) $(wildcard $(HOME)/.lein/profiles.d) $(wildcard /etc/leiningen/profiles.clj)
+	bash 'lein' 'update-in' ':plugins' 'conj' "[mx.cider/lein-enrich-classpath \"$(ENRICH_CLASSPATH_VERSION)\"]" '--' 'with-profile' $(LEIN_PROFILES) 'update-in' ':middleware' 'conj' 'cider.enrich-classpath.plugin-v2/middleware' '--' 'repl' | grep " -cp " > $@
+
+# Launches a repl, falling back to vanilla lein repl if something went wrong during classpath calculation.
+lein-repl: .enrich-classpath-lein-repl
+	@if grep --silent " -cp " .enrich-classpath-lein-repl; then \
+		eval "$$(cat .enrich-classpath-lein-repl) --interactive"; \
+	else \
+		echo "Falling back to lein repl... (you can avoid further falling back by removing .enrich-classpath-lein-repl)"; \
+		lein with-profiles $(LEIN_PROFILES) repl; \
+	fi
 
 clean:
 	lein clean
@@ -15,11 +51,14 @@ cljfmt-fix:
 	lein with-profile -user,+$(VERSION),+test,+cljfmt cljfmt fix
 
 eastwood:
-	lein with-profile -user,+$(VERSION),+test,+deploy,+eastwood eastwood
+	lein with-profile -user,-dev,+$(VERSION),+test,+deploy,+eastwood eastwood
 
 kondo:
-	lein with-profile -dev,+$(VERSION),+test,+clj-kondo run -m clj-kondo.main --lint src test .circleci/deploy
+	lein with-profile -dev,-dev,+$(VERSION),+test,+clj-kondo run -m clj-kondo.main --lint src test .circleci/deploy
+
+repl: lein-repl
 
+lint: kondo cljfmt eastwood
 
 # Deployment is performed via CI by creating a git tag prefixed with "v".
 # Please do not deploy locally as it skips various measures.

Diff for: README.md

@@ -61,7 +61,7 @@ the `+*cider-log*+` buffer. Additionally a log consumer will be
 attached to the appender to receive log events matching the search
 criteria after the search command has been issued. The log appender
 will be removed automatically once a new search has been submitted or
-when the `+*cider-log*+` buffer gets killed.
+when the `*cider-log*` buffer gets killed.
 
 ### Log Filters
 
@@ -109,6 +109,10 @@ like:
 
 ## Development
 
+#### Makefile
+
+The Makefile offers a variety of tasks: `test kondo eastwood cljfmt lint clean repl`.
+
 #### Deployment
 
 Here's how to deploy to Clojars:
@@ -128,6 +132,6 @@ on his private development tooling.
 
 ## License
 
-Copyright © 2023 CIDER Contributors
+Copyright © 2023-2024 CIDER Contributors
 
 Distributed under the Eclipse Public License, the same as Clojure.

Diff for: project.clj

@@ -2,7 +2,7 @@
 ;; whenever we perform a deployment.
 (defproject mx.cider/logjam (or (not-empty (System/getenv "PROJECT_VERSION"))
                                 "0.0.0")
-  :description ""
+  :description "An interactive, nrepl-oriented logging backend"
   :url "https://github.com/clojure-emacs/logjam"
   :license {:name "Eclipse Public License"
             :url "https://www.eclipse.org/legal/epl-v10.html"}
@@ -19,6 +19,9 @@
                                        [ch.qos.logback/logback-classic "1.3.7"]
                                        [org.clojure/clojure "1.11.1"]]}
 
+             :dev {:plugins [[cider/cider-nrepl "0.44.0"]
+                             [refactor-nrepl "3.9.0"]]}
+
              :1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
 
              :1.10 {:dependencies [[org.clojure/clojure "1.10.3"]]}
@@ -36,9 +39,9 @@
 
              :cljfmt {:plugins [[lein-cljfmt "0.9.2" :exclusions [org.clojure/clojure
                                                                   org.clojure/clojurescript]]]}
-             :eastwood {:plugins         [[jonase/eastwood "1.4.0"]]
+             :eastwood {:plugins         [[jonase/eastwood "1.4.2"]]
                         :eastwood {:add-linters [:performance :boxed-math]
                                    :config-files ["eastwood.clj"]}}
-             :clj-kondo {:dependencies [[clj-kondo "2023.05.26"]
+             :clj-kondo {:dependencies [[clj-kondo "2023.12.15"]
                                         [com.fasterxml.jackson.core/jackson-core "2.14.2"]]}
              :deploy {:source-paths [".circleci/deploy"]}})