Merge branch 'master' into develop

This commit is contained in:
Simon Brooke 2018-09-20 10:22:18 +01:00
commit ff12bfa867
2 changed files with 11 additions and 6 deletions

View file

@ -1,11 +1,13 @@
# lein-adl # lein-adl
A Leiningen plugin to generate Clojure source code from Application Description A Leiningen plugin to generate Clojure source code from [Application Description
Language. Language](https://github.com/simon-brooke/adl).
[![Clojars Project](https://img.shields.io/clojars/v/lein-adl.svg)](https://clojars.org/lein-adl)
## Usage ## Usage
Put `[lein-adl "0.1.0-SNAPSHOT"]` into the `:plugins` vector of your Put `[lein-adl "0.1.2"]` into the `:plugins` vector of your
project.clj. project.clj.
Example usage: Example usage:

View file

@ -1,10 +1,10 @@
(defproject lein-adl "0.1.1-SNAPSHOT" (defproject lein-adl "0.1.3-SNAPSHOT"
:description "Integrate Application Description Language into lein workflow" :description "Integrate Application Description Language into lein workflow"
:url "https://github.com/simon-brooke/lein-adl" :url "https://github.com/simon-brooke/lein-adl"
:license {:name "Eclipse Public License" ;; for compatibility with leiningen :license {:name "Eclipse Public License" ;; for compatibility with leiningen
:url "http://www.eclipse.org/legal/epl-v10.html"} :url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[adl-support "0.1.3"] :dependencies [[adl-support "0.1.3"]
[adl "1.4.2"]] [adl "1.4.3"]]
:plugins [[lein-codox "0.10.3"] :plugins [[lein-codox "0.10.3"]
[lein-release "1.0.5"]] [lein-release "1.0.5"]]
@ -13,6 +13,9 @@
;; `lein release`, first merge `develop` into `master`, and then, in branch ;; `lein release`, first merge `develop` into `master`, and then, in branch
;; `master`, run `lein release` ;; `master`, run `lein release`
;; in fact, `lein release` is pretty comprehensively broken, which is a
;; shame because it's a good idea.
:release-tasks [["vcs" "assert-committed"] :release-tasks [["vcs" "assert-committed"]
["clean"] ["clean"]
["test"] ["test"]