Merge branch 'master' into develop
This commit is contained in:
commit
f579273694
|
@ -1,4 +1,4 @@
|
||||||
(defproject adl-support "0.1.2-SNAPSHOT"
|
(defproject adl-support "0.1.3-SNAPSHOT"
|
||||||
:description "A small library of functions called by generated ADL code."
|
:description "A small library of functions called by generated ADL code."
|
||||||
:url "https://github.com/simon-brooke/adl-support"
|
:url "https://github.com/simon-brooke/adl-support"
|
||||||
:license {:name "MIT License"
|
:license {:name "MIT License"
|
||||||
|
@ -12,6 +12,10 @@
|
||||||
:plugins [[lein-codox "0.10.3"]
|
:plugins [[lein-codox "0.10.3"]
|
||||||
[lein-release "1.0.5"]]
|
[lein-release "1.0.5"]]
|
||||||
|
|
||||||
|
;; `lein release` doesn't work with `git flow release`. To use
|
||||||
|
;; `lein release`, first merge `develop` into `master`, and then, in branch
|
||||||
|
;; `master`, run `lein release`
|
||||||
|
|
||||||
:release-tasks [["vcs" "assert-committed"]
|
:release-tasks [["vcs" "assert-committed"]
|
||||||
["clean"]
|
["clean"]
|
||||||
["test"]
|
["test"]
|
||||||
|
|
Loading…
Reference in a new issue