From 883a9c7180f76ffc5499c41dd2b0041c9d501c8d Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sun, 28 Apr 2024 21:27:06 -0500 Subject: [PATCH 1/9] update deps --- deps.edn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps.edn b/deps.edn index 2138bd6..5b91899 100644 --- a/deps.edn +++ b/deps.edn @@ -1,8 +1,8 @@ {:paths ["src/main/clojure" "src/main/resources"] :deps - {org.clojure/clojure {:mvn/version "1.11.2"} - org.clojure/tools.deps {:mvn/version "0.19.1411"} + {org.clojure/clojure {:mvn/version "1.11.3"} + org.clojure/tools.deps {:mvn/version "0.19.1428"} ;org.clojure/tools.deps {:git/url "https://github.com/clojure/tools.deps.git" ; :git/sha "459222ca6e4fce91cf5838435589a028cedbc784"} org.clojure/tools.namespace {:mvn/version "1.5.0"} @@ -32,7 +32,7 @@ ;; Lint the source ;; clj -M:lint - :lint {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2023.09.07"}} + :lint {:replace-deps {clj-kondo/clj-kondo {:mvn/version "2024.03.13"}} :main-opts ["-m" "clj-kondo.main" "--lint" "src"]} } } From 2247f81e248bc2ef1d9066b7cc8a3a17409ce1a0 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sun, 28 Apr 2024 21:27:14 -0500 Subject: [PATCH 2/9] fix linting errors --- src/main/clojure/clojure/tools/build/util/file.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/clojure/clojure/tools/build/util/file.clj b/src/main/clojure/clojure/tools/build/util/file.clj index 3ec6120..fdfe250 100644 --- a/src/main/clojure/clojure/tools/build/util/file.clj +++ b/src/main/clojure/clojure/tools/build/util/file.clj @@ -26,7 +26,7 @@ :or {dirs false collect (constantly true)}}] (when (.exists root) - (loop [queue (conj (PersistentQueue/EMPTY) root) + (loop [queue (conj PersistentQueue/EMPTY root) collected []] (let [^File file (peek queue)] (if file @@ -80,7 +80,7 @@ (when (.exists src-dir) (let [root (.toPath src-dir) target (.toPath target-dir)] - (loop [queue (conj (PersistentQueue/EMPTY) src-dir)] + (loop [queue (conj PersistentQueue/EMPTY src-dir)] (let [^File file (peek queue)] (when file (let [path (.toPath file) From 77166942ddc77b70672226ca0dd03fc452f6ef58 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sun, 28 Apr 2024 21:30:41 -0500 Subject: [PATCH 3/9] add validation that basis is provided in compile-clj --- src/main/clojure/clojure/tools/build/api.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/clojure/clojure/tools/build/api.clj b/src/main/clojure/clojure/tools/build/api.clj index 966e3ae..4751a98 100644 --- a/src/main/clojure/clojure/tools/build/api.clj +++ b/src/main/clojure/clojure/tools/build/api.clj @@ -309,7 +309,7 @@ Returns nil." [params] - (assert-required "compile-clj" params [:class-dir]) + (assert-required "compile-clj" params [:basis :class-dir]) (assert-specs "compile-clj" params :class-dir ::specs/path :src-dirs ::specs/paths From e2d6d538cfa191d84e827cfd609b9bb03d29d813 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sun, 28 Apr 2024 21:31:14 -0500 Subject: [PATCH 4/9] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b7548b..de32f99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ Changelog =========== +* next + * Update deps to latest + * compile-clj - validate that basis is non-nil * v0.10.0 3a2c484 on Mar 8, 2024 * Updated deps to latest tools.deps and Clojure 1.11.2 * v0.9.6 8e78bcc on Oct 6, 2023 From 5e3b8f3fa45991a4a6b08565da9fd9b3535f39e6 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Mon, 29 Apr 2024 02:40:05 +0000 Subject: [PATCH 5/9] [maven-release-plugin] prepare release v0.10.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 711ca09..e57f19c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.github.clojure tools.build - 0.10.1-SNAPSHOT + 0.10.1 tools.build @@ -116,7 +116,7 @@ scm:git:git@github.com:clojure/tools.build.git scm:git:git@github.com:clojure/tools.build.git git@github.com:clojure/tools.build.git - HEAD + v0.10.1 From 90326cbc8745b867744368064edc6cc1cc783c05 Mon Sep 17 00:00:00 2001 From: clojure-build Date: Mon, 29 Apr 2024 02:40:05 +0000 Subject: [PATCH 6/9] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e57f19c..8381721 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.github.clojure tools.build - 0.10.1 + 0.10.2-SNAPSHOT tools.build @@ -116,7 +116,7 @@ scm:git:git@github.com:clojure/tools.build.git scm:git:git@github.com:clojure/tools.build.git git@github.com:clojure/tools.build.git - v0.10.1 + HEAD From 4b7365adc96a4c47dd07f4920872f9bbb40a8da8 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sun, 28 Apr 2024 21:43:43 -0500 Subject: [PATCH 7/9] update for release --- CHANGELOG.md | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de32f99..d8c3d27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog =========== -* next +* v0.10.1 5e3b8f3 on Apr 28, 2024 * Update deps to latest * compile-clj - validate that basis is non-nil * v0.10.0 3a2c484 on Mar 8, 2024 diff --git a/README.md b/README.md index 680b8fc..8d59217 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,13 @@ Latest release: As a git dep: ```clojure -io.github.clojure/tools.build {:git/tag "v0.10.0" :git/sha "3a2c484"} +io.github.clojure/tools.build {:git/tag "v0.10.1" :git/sha "5e3b8f3"} ``` As a Maven dep: ```clojure -io.github.clojure/tools.build {:mvn/version "0.10.0"} +io.github.clojure/tools.build {:mvn/version "0.10.1"} ``` # Developer Information From ef27192117bd5fa2b6e397b41644a53642a23819 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Sun, 28 Apr 2024 21:51:54 -0500 Subject: [PATCH 8/9] Use latest Clojure CLI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88edb96..f9ced98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: java-version: ${{ matrix.java-version }} - name: Setup Clojure - uses: DeLaGuardo/setup-clojure@12.1 + uses: DeLaGuardo/setup-clojure@12.5 with: - cli: 1.11.1.1413 + cli: latest - name: Checkout uses: actions/checkout@v4 From 48bd81800ad4ae2765676567dd7787067e4829f2 Mon Sep 17 00:00:00 2001 From: Alex Miller Date: Mon, 29 Apr 2024 11:14:39 -0500 Subject: [PATCH 9/9] Update deps Removed Java 8 for now as that seems to no longer work with Mac and setup-java --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9ced98..cbaa04f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,12 +5,12 @@ jobs: test: strategy: matrix: - java-version: ["8", "11", "17", "21"] + java-version: ["11", "17", "21"] os: [ubuntu-latest, macOS-latest, windows-latest] runs-on: ${{ matrix.os }} steps: - name: Prepare java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: "adopt" java-version: ${{ matrix.java-version }}