Skip to content

Commit

Permalink
Upgrade tools.trace
Browse files Browse the repository at this point in the history
  • Loading branch information
@vemv
vemv committed Feb 1, 2022
1 parent eda142d commit a108788
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## master (unreleased)

## 0.28.2 (2022-02-1)

Upgrade `tools.trace`.

## 0.28.1 (2022-01-21)

### Changes
Expand Down
16 changes: 9 additions & 7 deletions project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
(def fipp-version "0.6.25")

This comment has been minimized.

Sign in to view

Copy link
@bbatsov

bbatsov Feb 2, 2022

Member

Seems like an unrelated change. I'm all for DRY, but this also confuses https://versions.deps.co/clojure-emacs/cider-nrepl Now it's always going to think that the dep is outdated. I don't think we're using the unresolved-mode of MrAnderson (I don't even remember what it was exactly), so probably the real fix is to more its configuration.

This comment has been minimized.

Sign in to view

Copy link
@vemv

vemv Feb 2, 2022

Author Member

Seems like an unrelated change. I'm all for DRY, but this also confuses https://versions.deps.co/clojure-emacs/cider-nrepl Now it's always going to think that the dep is outdated.

I checked out why it's like that / the tradeoffs chosen in deps-app/versions#22 . It sounds like bit of unfortunate (yet justified) one.

If we went the antq way (to which I contributed a Lein plugin, i.e. it's all executing and no parsing) we'd be free to have project files as dynamic as we wanted.

The badge can be self-hosted: https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/adding-a-workflow-status-badge

This comment has been minimized.

Sign in to view

Copy link
@vemv

vemv Feb 2, 2022

Author Member

I don't think we're using the unresolved-mode of MrAnderson (I don't even remember what it was exactly), so probably the real fix is to more its configuration.

Agreed, I don't recall much what's going on in this code. We can just remove all these bits and see if CI (which does exercise make install) keeps passing

(defproject cider/cider-nrepl (or (not-empty (System/getenv "PROJECT_VERSION"))
"0.0.0")
:description "A collection of nREPL middleware designed to enhance Clojure editors."
Expand All @@ -9,12 +11,12 @@
^:inline-dep [cider/orchard "0.9.1" :exclusions [com.google.code.findbugs/jsr305 com.google.errorprone/error_prone_annotations]]
^:inline-dep [thunknyc/profile "0.5.2"]
^:inline-dep [mvxcvi/puget "1.3.1"]
^:inline-dep [fipp "0.6.25"] ; can be removed in unresolved-tree mode
^:inline-dep [fipp ~fipp-version] ; can be removed in unresolved-tree mode
^:inline-dep [compliment "0.3.12"]
^:inline-dep [org.rksm/suitable "0.4.1" :exclusions [org.clojure/clojurescript]]
^:inline-dep [cljfmt "0.8.0" :exclusions [org.clojure/clojurescript]]
^:inline-dep [org.clojure/tools.namespace "1.2.0"]
^:inline-dep [org.clojure/tools.trace "0.7.10"]
^:inline-dep [org.clojure/tools.trace "0.7.11"]
^:inline-dep [org.clojure/tools.reader "1.3.6"]]
:exclusions [org.clojure/clojure] ; see Clojure version matrix in profiles below

Expand All @@ -23,9 +25,9 @@
;; :pedantic? can be problematic for certain local dev workflows:
false)

:plugins [[thomasa/mranderson "0.5.3"]]
:plugins [[thomasa/mranderson "0.5.4-SNAPSHOT"]]
:mranderson {:project-prefix "cider.nrepl.inlined-deps"
:overrides {[mvxcvi/puget fipp] [fipp "0.6.18"]} ; only takes effect in unresolved-tree mode
:overrides {[mvxcvi/puget fipp] [fipp ~fipp-version]} ; only takes effect in unresolved-tree mode
:expositions [[mvxcvi/puget fipp]] ; only takes effect unresolved-tree mode
:unresolved-tree false}

Expand Down Expand Up @@ -67,10 +69,10 @@
:profiles {:provided {:dependencies [[org.clojure/clojure "1.10.3"]
[org.clojure/clojurescript "1.11.4" :scope "provided"]
[com.cognitect/transit-clj "1.0.324"]
[com.fasterxml.jackson.core/jackson-core "2.10.2"]
[commons-codec "1.11"]
[com.fasterxml.jackson.core/jackson-core "2.13.1"]
[commons-codec "1.15"]
[com.cognitect/transit-java "1.0.343"]
[com.google.errorprone/error_prone_annotations "2.1.3"]
[com.google.errorprone/error_prone_annotations "2.11.0"]
[com.google.code.findbugs/jsr305 "3.0.2"]]
:test-paths ["test/spec"]}

Expand Down

0 comments on commit a108788

Please sign in to comment.