Skip to content

Commit

Permalink
update tools.build; drop template pom.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
seancorfield committed Oct 6, 2023
1 parent ebf132b commit 92fb663
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 31 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

Only accretive/fixative changes will be made from now on.

* 2.1.next in progress
* Update `tools.build` to 0.9.6 (and get rid of `template/pom.xml` in favor of new `:pom-data` option to `b/write-pom`).

* 2.1.182 -- 2023-09-29
* Improved failure reporting: most failures now provide an additional message describing the failure as well as improving how the expected and actual values are displayed (primarily hiding `=?` and showing a more accurate/intuitive test form).
* Update `deps.edn` to use `:main-args` (instead of `:main-opts`) for parameterized tasks in `build.clj` -- see [Running Tasks based on Aliases](https://clojure-doc.org/articles/cookbooks/cli_build_projects/)
Expand Down
29 changes: 22 additions & 7 deletions build.clj
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,32 @@
(conj :cljs)))
opts)

(defn- pom-template [version]
[[:description "A clojure.test-compatible version of the classic Expectations testing library."]
[:url "https://github.com/clojure-expectations/clojure-test"]
[:licenses
[:license
[:name "Eclipse Public License"]
[:url "http://www.eclipse.org/legal/epl-v10.html"]]]
[:developers
[:developer
[:name "Sean Corfield"]]]
[:scm
[:url "https://github.com/clojure-expectations/clojure-test"]
[:connection "scm:git:https://github.com/clojure-expectations/clojure-test.git"]
[:developerConnection "scm:git:ssh:[email protected]:clojure-expectations/clojure-test.git"]
[:tag (str "v" version)]]])

(defn- jar-opts [opts]
(let [version (if (:snapshot opts) snapshot version)]
(assoc opts
:lib lib :version version
:jar-file (format "target/%s-%s.jar" lib version)
:scm {:tag (str "v" version)}
:basis (b/create-basis {})
:lib lib :version version
:jar-file (format "target/%s-%s.jar" lib version)
:basis (b/create-basis {})
:class-dir class-dir
:target "target"
:src-dirs ["src"]
:src-pom "template/pom.xml")))
:target "target"
:src-dirs ["src"]
:pom-data (pom-template version))))

(defn ci "Run the CI pipeline of tests (and build the JAR)." [opts]
(test opts)
Expand Down
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:deps {org.clojure/clojure {:mvn/version "1.9.0"}}
:aliases
{;; for help: clojure -A:deps -T:build help/doc
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.5"}
:build {:deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}
slipset/deps-deploy {:mvn/version "0.2.1"}}
:ns-default build}

Expand Down
23 changes: 0 additions & 23 deletions template/pom.xml

This file was deleted.

0 comments on commit 92fb663

Please sign in to comment.