Fix error with overloaded Engine.Settings.mergeProperties (#34)

* fix properties file processing Co-authored-by: Drew Thompson <drew.thompson@singlewire.com>
livingsocial · Oct 12, 2021 · 577f26a · 577f26a
1 parent 6550038
commit 577f26a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/project.clj b/project.clj
@@ -1,6 +1,6 @@
-(def dependency-check-version "6.0.2")
+(def dependency-check-version "6.2.2")
 
-(defproject com.livingsocial/lein-dependency-check "1.1.5"
+(defproject com.livingsocial/lein-dependency-check "1.1.6"
   :description "Clojure command line tool for detecting vulnerable project dependencies"
   :url "https://github.com/livingsocial/lein-dependency-check"
   :license {:name "The MIT License (MIT)"

diff --git a/src/lein_dependency_check/core.clj b/src/lein_dependency_check/core.clj
@@ -33,7 +33,7 @@
         _ (when (.exists (io/as-file suppression-file))
             (.setString settings Settings$KEYS/SUPPRESSION_FILE suppression-file))
         _ (when properties-file
-            (.mergeProperties settings properties-file))
+            (.mergeProperties settings  (io/as-file properties-file)))
         engine (Engine. settings)]
     (prn "Scanning" (count files) "file(s)...")
     (doseq [^File file files]