[housekeeping] bump deps, format code

lispyclouds · Apr 26, 2024 · c840646 · c840646
1 parent e96e13c
commit c840646
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,18 +20,18 @@ jobs:
         uses: "actions/checkout@v4"
 
       - name: "Prepare Java"
-        uses: "actions/setup-java@v3"
+        uses: "actions/setup-java@v4"
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '22'
 
       - name: "Prepare tools-deps"
         uses: "DeLaGuardo/setup-clojure@master"
         with:
           cli: latest
 
       - name: "Apply Cache"
-        uses: "actions/cache@v3"
+        uses: "actions/cache@v4"
         with:
           path: |
             ~/.m2/repository

diff --git a/deps.edn b/deps.edn
@@ -5,6 +5,6 @@
 ; https://opensource.org/licenses/MIT.
 
 {:deps    {io.swagger.parser.v3/swagger-parser {:mvn/version "2.1.22"}}
- :aliases {:test {:extra-deps {lambdaisland/kaocha    {:mvn/version "1.87.1366"}
+ :aliases {:test {:extra-deps {lambdaisland/kaocha    {:mvn/version "1.88.1376"}
                                org.clojure/test.check {:mvn/version "1.1.1"}}
                   :main-opts  ["-m" "kaocha.runner" "--reporter" "kaocha.report.progress/report"]}}}
diff --git a/project.clj b/project.clj
@@ -10,4 +10,4 @@
   :description  "A tiny library converting OpenAPI route definitions to Reitit routes."
   :license      {:name "MIT"
                  :url  "https://opensource.org/licenses/MIT"}
-  :dependencies [[io.swagger.parser.v3/swagger-parser "2.1.18"]])
+  :dependencies [[io.swagger.parser.v3/swagger-parser "2.1.22"]])
diff --git a/src/navi/core.clj b/src/navi/core.clj
@@ -36,7 +36,7 @@
                     (.setTypes schema #{type})
                     (spec schema))
                   types)
-         (into [:or]))
+             (into [:or]))
         (finally
           (.setTypes schema types))))))
 
@@ -86,7 +86,7 @@
   [_]
   int?)
 
-(defmethod spec 
+(defmethod spec
   "number"
   [_]
   number?)

diff --git a/test/navi/core_test.clj b/test/navi/core_test.clj
@@ -52,29 +52,29 @@
            (core/schema->spec (StringSchema.))))
     (is (= string?
            (core/schema->spec (doto (Schema.)
-                        (.addType "string"))))))
+                                (.addType "string"))))))
   (testing "integer"
     (is (= int?
            (core/schema->spec (IntegerSchema.))))
     (is (= int?
            (core/schema->spec (doto (Schema.)
-                        (.addType "integer"))))))
+                                (.addType "integer"))))))
   (testing "number"
     (is (= number?
            (core/schema->spec (NumberSchema.))))
     (is (= number?
            (core/schema->spec (doto (Schema.)
-                        (.addType "number"))))))
+                                (.addType "number"))))))
   (testing "null"
     (is (= nil?
            (core/schema->spec (doto (Schema.)
-                        (.addType "null"))))))
+                                (.addType "null"))))))
   (testing "empty object"
     (is (= [:map {:closed false}]
            (core/schema->spec (ObjectSchema.))))
     (is (= [:map {:closed false}]
            (core/schema->spec (doto (Schema.)
-                        (.addType "object"))))))
+                                (.addType "object"))))))
   (testing "object"
     (let [props (doto (LinkedHashMap.)
                   (.put "x" (IntegerSchema.))
@@ -100,7 +100,7 @@
            (core/schema->spec (ArraySchema.))))
     (is (= [:sequential any?]
            (core/schema->spec (doto (Schema.)
-                        (.addType "array"))))))
+                                (.addType "array"))))))
   (testing "array"
     (let [arr (doto (ArraySchema.)
                 (.setItems (StringSchema.)))
@@ -117,12 +117,12 @@
            (core/schema->spec (UUIDSchema.))))
     (is (= uuid?
            (core/schema->spec (doto (Schema.)
-                        (.addType "string")
-                        (.setFormat "uuid"))))))
-  
+                                (.addType "string")
+                                (.setFormat "uuid"))))))
+
   (testing "jsonschemas with multiple types"
     (let [strint (-> (JsonSchema.)
-                   (.types #{"string" "integer"}))]
+                     (.types #{"string" "integer"}))]
       (is (#{[:or string? int?] [:or int? string?]}
            (core/schema->spec strint))))))