Merge remote-tracking branch 'github/develop' into develop

This commit is contained in:
Simon Brooke 2018-09-21 20:16:38 +01:00
commit 6b8ce3f42e
3 changed files with 24 additions and 19 deletions

18
CHANGELOG.md Normal file
View file

@ -0,0 +1,18 @@
# Change Log
All notable changes to this project will be documented in this file. This change log is intended to follow the conventions of [keepachangelog.com](http://keepachangelog.com/).
## Release 1.4.5, 2018-09-20
Generation of skeleton Clojure webapp is now largely complete; this release is not the final 'beta' release of this functionality, but is a dummy run towards that release.
## Release 1.4.1
Release 1.4.1 adds a 'magnitude' element to entities, in order to provide a pragma for when
to switch to asynchronous select widgets.
It also provides a family of transforms, written in Clojure, to generate a skeleton Clojure
web app from an ADL specification.
## Release 1.4
Release 1.4 adds an 'order' element as a possible child of the 'list' element, in order to specify the default order of lists. Otherwise unchanged from 1.3.

View file

@ -1,12 +0,0 @@
# Release 1.4.1
Release 1.4.1 adds a 'magnitude' element to entities, in order to provide a pragma for when
to switch to asynchronous select widgets.
It also provides a family of transforms, written in Clojure, to generate a skeleton Clojure
web app from an ADL specification.
# Release 1.4
Release 1.4 adds an 'order' element as a possible child of the 'list' element, in order to specify
the default order of lists. Otherwise unchanged from 1.3.

View file

@ -1,11 +1,11 @@
(defproject adl "1.4.4-SNAPSHOT" (defproject adl "1.4.6-SNAPSHOT"
:description "An application to transform an ADL application specification :description "An application to transform an ADL application specification
document into skeleton code for a Clojure web-app" document into skeleton code for a Clojure web-app"
:url "https://github.com/simon-brooke/adl" :url "https://github.com/simon-brooke/adl"
:license {:name "GNU Lesser General Public License, version 3.0 or (at your option) any later version" :license {:name "GNU Lesser General Public License, version 3.0 or (at your option) any later version"
:url "https://www.gnu.org/licenses/lgpl-3.0.en.html"} :url "https://www.gnu.org/licenses/lgpl-3.0.en.html"}
:dependencies [[adl-support "0.1.4-SNAPSHOT"] :dependencies [[adl-support "0.1.4"]
[bouncer "1.0.1"] [bouncer "1.0.1"]
[clojure-saxon "0.9.4"] [clojure-saxon "0.9.4"]
[environ "1.1.0"] [environ "1.1.0"]
@ -27,12 +27,11 @@
:codox {:metadata {:doc "FIXME: write docs"} :codox {:metadata {:doc "FIXME: write docs"}
:output-path "docs"} :output-path "docs"}
;; `lein release` doesn't work with `git flow release`. To use :deploy-repositories [["releases" :clojars]
;; `lein release`, first merge `develop` into `master`, and then, in branch ["snapshots" :clojars]]
;; `master`, run `lein release`
:deploy-repositories [["clojars" {:url "https://clojars.org/repo" ;; `lein release` doesn't play nice with `git flow release`. Run `lein release` in the
:sign-releases true}]] ;; `develop` branch, then merge the release tag into the `master` branch.
:release-tasks [["vcs" "assert-committed"] :release-tasks [["vcs" "assert-committed"]
["clean"] ["clean"]