From 18989a88aa0e224803a88c0b3b1999724b2a1a6c Mon Sep 17 00:00:00 2001 From: Joshua Smock Date: Sat, 17 Jun 2023 12:02:53 +0200 Subject: [PATCH] Add current git revision to POM file Without this, and without adding a tag for the releases in the repo, cljdoc can't get the readme and related docs. - Bump to 1.1.3 --- changelog.md | 9 +++++++++ cljest/build.edn | 2 +- cljest/dev/cljest/build.clj | 5 +++-- cljest/package-lock.json | 2 +- jest-preset-cljest/package-lock.json | 4 ++-- jest-preset-cljest/package.json | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/changelog.md b/changelog.md index a9179be..892edce 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,14 @@ # Changelog +# 1.1.3 + +This version and 1.1.2 have no user facing changes except that they make the `cljdoc` build work completely, as in `1.1.1` while the analysis worked, the docs didn't. + +## Internal + +- [Use `clojure` rather than `clj` and add update `scm.connection` value to use `scm:git:git...`.](https://github.com/pitch-io/cljest/pull/42) +- [Add git revision to POM file.](https://github.com/pitch-io/cljest/pull/43) + # 1.1.1 ## Improvements diff --git a/cljest/build.edn b/cljest/build.edn index fe51de1..ddf57e1 100644 --- a/cljest/build.edn +++ b/cljest/build.edn @@ -1,5 +1,5 @@ {:lib com.pitch/cljest - :version "1.1.2" + :version "1.1.3" :scm {:url "https://github.com/pitch-io/cljest" :connection "scm:git:git://github.com/pitch-io/cljest.git" :developerConnection "scm:git:git@github.com:pitch-io/cljest.git"} diff --git a/cljest/dev/cljest/build.clj b/cljest/dev/cljest/build.clj index 2f7b93b..b0da597 100644 --- a/cljest/dev/cljest/build.clj +++ b/cljest/dev/cljest/build.clj @@ -83,7 +83,8 @@ [k (assoc v :optional? true)])) (into {}))}}) jar-dir "dist/build_files/jar" - pom-dir (str "dist/" (lib->group-id lib))] + pom-dir (str "dist/" (lib->group-id lib)) + git-rev (tools.build.api/git-process {:git-args ["rev-parse" "HEAD"]})] (tools.build.api/copy-dir {:src-dirs src-dirs :target-dir jar-dir :ignores (map re-pattern ignore)}) @@ -106,6 +107,6 @@ :lib lib :version version :basis basis - :scm scm + :scm (assoc scm :tag git-rev) :src-dirs ["src"]}))) diff --git a/cljest/package-lock.json b/cljest/package-lock.json index e22ad9a..f97c109 100644 --- a/cljest/package-lock.json +++ b/cljest/package-lock.json @@ -23,7 +23,7 @@ } }, "../jest-preset-cljest": { - "version": "1.1.0", + "version": "1.1.3", "dev": true, "license": "MIT", "dependencies": { diff --git a/jest-preset-cljest/package-lock.json b/jest-preset-cljest/package-lock.json index 4e15584..510625a 100644 --- a/jest-preset-cljest/package-lock.json +++ b/jest-preset-cljest/package-lock.json @@ -1,12 +1,12 @@ { "name": "jest-preset-cljest", - "version": "1.1.2", + "version": "1.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "jest-preset-cljest", - "version": "1.1.2", + "version": "1.1.3", "license": "MIT", "dependencies": { "chalk": "4.1.2", diff --git a/jest-preset-cljest/package.json b/jest-preset-cljest/package.json index c201516..a697991 100644 --- a/jest-preset-cljest/package.json +++ b/jest-preset-cljest/package.json @@ -1,6 +1,6 @@ { "name": "jest-preset-cljest", - "version": "1.1.2", + "version": "1.1.3", "description": "A preset for Jest to allow compiling ClojureScript tests", "main": "jest-preset.js", "scripts": {},