Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't force a build.edn file #33

Merged
merged 6 commits into from
Apr 11, 2024
Merged

Don't force a build.edn file #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f9cb07
Don't require build.edn (allow to store all config in deps.edn map)
ivarref Mar 25, 2024
47ada53
Bump deps-deploy
ivarref Mar 25, 2024
fc27766
tools.deps is no longer alpha
ivarref Mar 25, 2024
55233ff
Update src/build_edn/main.clj
ivarref Apr 10, 2024
36053a7
Use io not jio https://github.com/bbatsov/clojure-style-guide#use-idi…
ivarref Apr 10, 2024
c8bdccc
Fix repository test
ivarref Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}

Expand Down
11 changes: 7 additions & 4 deletions src/build_edn/main.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/build_edn/repository.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
2 changes: 1 addition & 1 deletion test/build_edn/repository_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down