merge

clojure · May 1, 2024 · df59e82 · df59e82
2 parents 5daff1b + 48bd818
commit df59e82
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,20 +5,20 @@ 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 }}
 
       - 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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,9 @@ Changelog
 
 * next
   * compile-clj - add simple spec for :basis arg
-* v0.10.1 on Apr 28, 2024
-  * compile-clj - add required check on :basis arg
+* 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
   * Updated deps to latest tools.deps and Clojure 1.11.2
 * v0.9.6 8e78bcc on Oct 6, 2023

diff --git 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

diff --git 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"]}
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.clojure</groupId>
   <artifactId>tools.build</artifactId>
-  <version>0.10.1-SNAPSHOT</version>
+  <version>0.10.2-SNAPSHOT</version>
   <name>tools.build</name>
 
   <parent>

diff --git 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

diff --git 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)