Skip to content

Commit

Permalink
updated deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@just-sultanov
just-sultanov committed Nov 18, 2019
1 parent 8ceb387 commit 89bcde1
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 47 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
:tda-changelog: https://github.com/clojure/tools.deps.alpha/blob/master/CHANGELOG.md


== Changelog

=== v0.4.4
Expand Down
16 changes: 13 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
SHELL = bash

SCM_URL="https://github.com/just-sultanov/clj-deps"
GROUP_ID=clj-deps
ARTIFACT_ID=clj-deps
TAG_MSG="release a new version"

help: ## Show help
Expand All @@ -18,7 +20,7 @@ clean: ## Clean
@echo "=================================================================="
@echo "Clean..."
@echo "=================================================================="
rm -f pom.xml && rm -rf target
rm -rf pom.xml clj-deps.jar target
@echo -e "\n"


Expand All @@ -43,12 +45,12 @@ build: ## Build jar
@echo "Build..."
@echo "=================================================================="
clojure -A:build
clojure -A:version --pom --scm-url ${SCM_URL}
clojure -A:version --pom --group-id ${GROUP_ID} --artifact-id ${ARTIFACT_ID} --scm-url ${SCM_URL}
@echo -e "\n"


init: ## Init first version
git tag --annotate --message ${TAG_MSG} v0.1.0
git tag --annotate --message ${TAG_MSG} v0.0.1


patch: ## Increment patch version
Expand All @@ -63,6 +65,14 @@ major: ## Increment major version
clojure -A:version major --tag --message ${TAG_MSG}


install: ## Install locally
@echo "=================================================================="
@echo "Install locally..."
@echo "=================================================================="
clojure -A:install
@echo -e "\n"


deploy: ## Deploy to clojars
@echo "=================================================================="
@echo "Deploy..."
Expand Down
41 changes: 16 additions & 25 deletions README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,32 @@ Add the following dependency in your project:
(ns example
(:require [clj-deps.core :as deps]))
;; load library from git by https
(deps/add-lib 'cljdoc {:git/url "https://github.com/cljdoc/cljdoc.git"
:sha "4b3fe041ee3e35c937f2877f40209b4a62036bef"})
;; load library from git via https
(deps/add-lib 'clj-helpers {:git/url "https://github.com/just-sultanov/clj-helpers.git"
:sha "db6263b750a66c3f3df99e14a53ba9e416f34fa3"})
;; => true
;; load library from git by ssh
(deps/add-lib 'cljdoc {:git/url "git@github.com:cljdoc/cljdoc.git"
:sha "4b3fe041ee3e35c937f2877f40209b4a62036bef"})
;; load library from git via ssh
(deps/add-lib 'clj-helpers {:git/url "git@github.com:just-sultanov/clj-helpers.git"
:sha "db6263b750a66c3f3df99e14a53ba9e416f34fa3"})
;; => true
;; load library from maven
(deps/add-lib 'add-lib 'org.yaml/snakeyaml {:mvn/version "1.25"})
(deps/add-lib 'clj-helpers {:mvn/version "0.2.0"})
;; => true
(deps/add-lib 'clj-fsm {:mvn/version "0.2.2"})
;; => true
;; load library from your own repository
(deps/add-lib 'group-id/artifact-id {:mvn/version "1.2.3"}
{:mvn/repos {"repo-name" {:url "https://repo.org"}}})
;; => true
;; load library from local root
(deps/add-lib 'group-id/artifact-id {:local/root "/path/to/file.jar"})
;; => true
Expand Down Expand Up @@ -97,27 +105,10 @@ init Init first version
patch Increment patch version
minor Increment minor version
major Increment major version
install Install locally
deploy Deploy to clojars
----

=== Changelog

===== v0.4.2

* tools.deps.alpha library updated to https://github.com/clojure/tools.deps.alpha/blob/master/CHANGELOG.md[0.8.584]

===== v0.4.0

* tools.deps.alpha library updated to https://github.com/clojure/tools.deps.alpha/blob/master/CHANGELOG.md[0.8.578]

===== v0.3.33

* tools.deps.alpha library updated to https://github.com/clojure/tools.deps.alpha/blob/master/CHANGELOG.md[0.7.549]

===== v0.3.31

* tools.deps.alpha library updated to https://github.com/clojure/tools.deps.alpha/blob/master/CHANGELOG.md[0.7.541]

=== License

link:LICENSE[Copyright © 2019 Ilshat Sultanov]
13 changes: 8 additions & 5 deletions deps.edn
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
{:paths ["src"]

:deps {org.clojure/clojure {:mvn/version "1.10.1"}
org.clojure/tools.deps.alpha {:mvn/version "0.8.584"}
org.clojure/tools.deps.alpha {:mvn/version "0.8.591"}
javax.xml.bind/jaxb-api {:mvn/version "2.3.1"}
org.clojure/core.rrb-vector {:mvn/version "0.1.1"}}

:aliases {:repl {:extra-deps {nrepl {:mvn/version "0.6.0"}
com.bhauman/rebel-readline {:mvn/version "0.1.4"}}
:aliases {:repl {:extra-deps {nrepl {:mvn/version "0.6.0"}}
:main-opts ["--main" "nrepl.cmdline" "--port" "7888"]}

:test {:extra-deps {lambdaisland/kaocha {:mvn/version "0.0-554"}
lambdaisland/kaocha-cloverage {:mvn/version "0.0-41"}}
:extra-paths ["test"]}

:build {:extra-deps {seancorfield/depstar {:mvn/version "0.3.4"}}
:main-opts ["--main" "hf.depstar.jar" "target/clj-deps.jar"]}
:main-opts ["--main" "hf.depstar.jar" "clj-deps.jar"]}

:version {:extra-deps {com.workframe/garamond {:mvn/version "0.4.0"}}
:main-opts ["-m" "garamond.main"]}

:install {:extra-deps {deps-deploy {:mvn/version "0.0.9"}}
:main-opts ["-m" "deps-deploy.deps-deploy"
"install" "clj-deps.jar"]}

:deploy {:extra-deps {deps-deploy {:mvn/version "0.0.9"}}
:main-opts ["--main" "deps-deploy.deps-deploy"
"deploy" "target/clj-deps.jar"]}}}
"deploy" "clj-deps.jar"]}}}
20 changes: 6 additions & 14 deletions test/clj_deps/core_test.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,12 @@
[clj-deps.core :as sut]))

(deftest test-add-lib
#_(testing "should be added java library from git by ssh"
(let [added? (sut/add-lib 'org.apache.commons/commons-lang3 {:git/url "git@github.com:apache/commons-lang.git"
:sha "c21484b730221bc87ca26553155350292aa30f0d"})]
(is (true? added?))))

(testing "should be added java library from maven"
(let [added? (sut/add-lib 'org.yaml/snakeyaml {:mvn/version "1.25"})]
(is (true? added?))))

(testing "should be added clojure library from git by https"
(let [added? (sut/add-lib 'cljdoc {:git/url "https://github.com/cljdoc/cljdoc.git"
:sha "4b3fe041ee3e35c937f2877f40209b4a62036bef"})]
(is (true? added?))))
(is (sut/add-lib 'clj-helpers {:git/url "https://github.com/just-sultanov/clj-helpers.git"
:sha "db6263b750a66c3f3df99e14a53ba9e416f34fa3"}))
(is (sut/add-lib 'clj-fsm {:git/url "https://github.com/just-sultanov/clj-fsm.git"
:sha "396f95a1f28a1fae7672bdf4793e9168abaf2990"})))

(testing "should be added clojure library from maven"
(let [added? (sut/add-lib 'clj-fsm {:mvn/version "0.2.2"})]
(is (true? added?)))))
(is (true? (sut/add-lib 'clj-helpers {:mvn/version "0.2.0"})))
(is (true? (sut/add-lib 'clj-fsm {:mvn/version "0.2.2"})))))

0 comments on commit 89bcde1

Please sign in to comment.