Merge remote-tracking branch 'upstream/develop' into lread-issue-290

* upstream/develop:
  update eastwood etc
  add distribution (jdk)
  add maven cache to GH Actions
This commit is contained in:
lread 2021-08-30 22:07:08 -04:00
commit 68a63b7078
4 changed files with 9 additions and 4 deletions

View file

@ -10,11 +10,12 @@ jobs:
java: [ '8', '11', '14', '15', '16', '17-ea' ] java: [ '8', '11', '14', '15', '16', '17-ea' ]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Setup Java - uses: actions/setup-java@v2
uses: actions/setup-java@v1
with: with:
distribution: 'adopt'
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
- name: Setup Clojure cache: 'maven'
- name: Clojure CLI
uses: DeLaGuardo/setup-clojure@master uses: DeLaGuardo/setup-clojure@master
with: with:
tools-deps: '1.10.3.933' tools-deps: '1.10.3.933'

View file

@ -1,5 +1,8 @@
# Changes # Changes
* 2.0.next in progress
* Clean up build/update deps.
* 2.0.783 -- 2021-08-15 (a.k.a "2.0 Gold") * 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 #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. * Fixes #340 by making the "hyphen to space" logic more general so _operators_ containing `-` should retain the hyphen without special cases.

View file

@ -35,5 +35,5 @@
"-c" "{:warnings,{:single-segment-namespace,false}}" "-c" "{:warnings,{:single-segment-namespace,false}}"
"-d" "target/test-doc-blocks/test"]} "-d" "target/test-doc-blocks/test"]}
: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\"]}"]}}} :main-opts ["-m" "eastwood.lint" "{:source-paths,[\"src\"]}"]}}}

View file

@ -25,6 +25,7 @@
<url>https://github.com/seancorfield/honeysql</url> <url>https://github.com/seancorfield/honeysql</url>
<connection>scm:git:git://github.com/seancorfield/honeysql.git</connection> <connection>scm:git:git://github.com/seancorfield/honeysql.git</connection>
<developerConnection>scm:git:ssh://git@github.com/seancorfield/honeysql.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com/seancorfield/honeysql.git</developerConnection>
<tag>TAG</tag>
</scm> </scm>
<dependencies> <dependencies>
<dependency> <dependency>