Merge pull request #33 from ivarref/main

Don't force a build.edn file
liquidz · Apr 11, 2024 · e199eb9 · e199eb9
2 parents ab331f5 + c8bdccc
commit e199eb9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/deps.edn b/deps.edn
@@ -4,7 +4,7 @@
  io.github.clojure/tools.build {:mvn/version "0.9.6"}
  rewrite-clj/rewrite-clj {:mvn/version "1.1.47"}
  metosin/malli {:mvn/version "0.13.0"}
- slipset/deps-deploy {:mvn/version "0.2.1"}
+ slipset/deps-deploy {:mvn/version "0.2.2"}
  pogonos/pogonos {:mvn/version "0.2.1"}
  aero/aero {:mvn/version "1.1.6"}}
 

diff --git a/src/build_edn/main.clj b/src/build_edn/main.clj
@@ -1,15 +1,18 @@
 (ns build-edn.main
  (:require
  [aero.core :as aero]
- [build-edn.core :as core]))
+ [build-edn.core :as core]
+ [clojure.java.io :as io]))
 
 (defn- load-config
  ([]
  (load-config "build.edn"))
  ([path]
- (-> path
- (aero/read-config)
- (assoc :config-file path))))
+ (if (.exists (io/file path))
+ (-> path
+ (aero/read-config)
+ (assoc :config-file path))
+ {})))
 
 (defn pom
  "Generate pom.xml"

diff --git a/src/build_edn/repository.clj b/src/build_edn/repository.clj
@@ -1,8 +1,8 @@
 (ns build-edn.repository
  (:require
  [clojure.java.io :as io]
- [clojure.tools.deps.alpha :as deps]
- [clojure.tools.deps.alpha.util.maven :as deps.u.maven]
+ [clojure.tools.deps :as deps]
+ [clojure.tools.deps.util.maven :as deps.u.maven]
  [deps-deploy.maven-settings :as dd.maven-settings])
  (:import
  org.apache.maven.settings.Server))

diff --git a/test/build_edn/repository_test.clj b/test/build_edn/repository_test.clj
@@ -2,7 +2,7 @@
  (:require
  [build-edn.repository :as sut]
  [clojure.test :as t]
- [clojure.tools.deps.alpha.util.maven :as deps.u.maven]
+ [clojure.tools.deps.util.maven :as deps.u.maven]
  [deps-deploy.maven-settings :as dd.maven-settings])
  (:import
  (org.apache.maven.settings