From 55b68c4918c4d04f0101dda23f3a37b77c635ff7 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Mon, 30 Aug 2021 17:58:15 -0700 Subject: [PATCH 1/3] add maven cache to GH Actions --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 70382a6..e72f2aa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,11 +10,11 @@ jobs: java: [ '8', '11', '14', '15', '16', '17-ea' ] steps: - uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} - - name: Setup Clojure + cache: 'maven' + - name: Clojure CLI uses: DeLaGuardo/setup-clojure@master with: tools-deps: '1.10.3.933' From 9b018aa4ee1b7d62ceca33b0216f513d3ed826a9 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Mon, 30 Aug 2021 18:00:33 -0700 Subject: [PATCH 2/3] add distribution (jdk) --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e72f2aa..18bf33b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,6 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: ${{ matrix.java }} cache: 'maven' - name: Clojure CLI From 17881ef2b444765d640138404949333e1e31b7f7 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Mon, 30 Aug 2021 18:47:10 -0700 Subject: [PATCH 3/3] update eastwood etc --- CHANGELOG.md | 3 +++ deps.edn | 2 +- pom.xml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5fc00a..baecba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes +* 2.0.next in progress + * Clean up build/update deps. + * 2.0.783 -- 2021-08-15 (a.k.a "2.0 Gold") * Fixes #344 by no longer dropping the qualifier on columns in a `SET` clause _for the `:mysql` dialect only_; the behavior is unchanged for all other dialects. * Fixes #340 by making the "hyphen to space" logic more general so _operators_ containing `-` should retain the hyphen without special cases. diff --git a/deps.edn b/deps.edn index e1e97de..6a06057 100644 --- a/deps.edn +++ b/deps.edn @@ -24,5 +24,5 @@ :main-opts ["-m" "cljs-test-runner.main"]} :readme {:extra-deps {seancorfield/readme {:mvn/version "1.0.16"}} :main-opts ["-m" "seancorfield.readme"]} - :eastwood {:extra-deps {jonase/eastwood {:mvn/version "0.5.1"}} + :eastwood {:extra-deps {jonase/eastwood {:mvn/version "0.9.9"}} :main-opts ["-m" "eastwood.lint" "{:source-paths,[\"src\"]}"]}}} diff --git a/pom.xml b/pom.xml index 06153d6..b97c457 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ https://github.com/seancorfield/honeysql scm:git:git://github.com/seancorfield/honeysql.git scm:git:ssh://git@github.com/seancorfield/honeysql.git + TAG