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.

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

Pods v3 #749

Open
wants to merge 28 commits into
base: 3.0.0-SNAPSHOT
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9c76d0c
Update REPL-y to 0.4.3
bbatsov Jan 1, 2019
ec91953
Update nREPL to 0.5.3
bbatsov Jan 1, 2019
00bfcaf
Remove redundant exclusion
bbatsov Jan 1, 2019
ca03c05
Upgrade dependencies to fix test failures on JDK 11.
sundbp Feb 13, 2019
a3b4c41
Merge pull request #724 from bbatsov/update-nrepl
burn2delete Mar 14, 2019
096b892
Update nREPL to 0.6
bbatsov Mar 19, 2019
9d115c5
Merge pull request #740 from bbatsov/nrepl-0.6
burn2delete Mar 19, 2019
d534d63
Merge branch 'master' into fix-for-jdk11
sundbp Mar 20, 2019
7bc8b56
upgrade puget to latest point release
sundbp Mar 20, 2019
5fe5ddd
Merge pull request #738 from sundbp/fix-for-jdk11
burn2delete Mar 20, 2019
9cd53ac
update java to 1.8
burn2delete Apr 12, 2019
55e4b55
update boot dependencies
burn2delete Apr 12, 2019
fb7f5c8
Update version.properties
burn2delete Apr 12, 2019
519fe7d
Update Makefile
burn2delete Apr 12, 2019
4d0d807
remove java version check
burn2delete Apr 12, 2019
dde4659
remove aot from projects
burn2delete Apr 13, 2019
da634df
restore pod aot
burn2delete Apr 13, 2019
ef97bfa
Merge branch 'master' of https://github.com/boot-clj/boot
burn2delete Apr 14, 2019
5d2fbb1
update boot version
burn2delete Apr 14, 2019
0058c34
fix formatting and tests
burn2delete Apr 14, 2019
8ed925b
Update README.md
burn2delete Apr 27, 2019
b8e057f
Update pod.clj
burn2delete Apr 28, 2019
afd4d3f
Update pod.clj
burn2delete Apr 29, 2019
7b9b7ed
add prepl-server task
daveyarwood Jun 1, 2019
95d1a0e
Merge pull request #747 from daveyarwood/prepl-server
burn2delete Jun 1, 2019
dfc9fae
wip fileset
burn2delete Jul 7, 2019
b8d9301
add initial tools.deps entrypoints
burn2delete Jul 7, 2019
3a9e2e1
Merge branch 'master' of https://github.com/boot-clj/boot into pods-v3
burn2delete Jul 7, 2019
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
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changes

## 2.8.3

#### Improved

- Updated REPL-y to 0.4.3.
- Updated nREPL to 0.6.0.

## 2.8.2

#### Fixed
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ $(baseuber): boot/base/pom.xml $(shell find boot/base/src/main)
install: .installed

.deployed: .installed
@echo -e "\033[0;33m<< Java version: $(java_version) >>\033[0m"
@[ "$(java_version)" == "1.7" ] \
|| (echo -e "\033[0;31mYou must build with Java version 1.7 only.\033[0m" && false)
(cd boot/base && lein deploy clojars boot/base $(version) target/base-$(version).jar pom.xml)
(cd boot/pod && lein deploy clojars)
(cd boot/aether && lein deploy clojars)
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ it `build`. We'll modify `build.boot` such that it contains the following:
[]
(comp (pom) (jar) (install)))
```
`NOTE: When using comp, all arguments must be functions - nil is not supported.
In this example we call each task middleware which returns the task function, these functions are composed into a new build task.`

Now we should be able to see the `build` task listed among the available tasks
in the output of `boot -h`, and we can run the task from the command line as we
Expand Down
1 change: 1 addition & 0 deletions boot.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BOOT_VERSION=3.0.0-SNAPSHOT
8 changes: 4 additions & 4 deletions boot/aether/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
(.getProperty "version")))

(defproject boot/aether version
:aot :all
:jar-exclusions [#"^clojure/core/"]
:description "Boot aether module–performs maven dependency resolution."
:url "https://github.com/boot-clj/boot"
:scm {:url "https://github.com/boot-clj/boot.git" :dir "../../"}
:repositories [["clojars" {:url "https://clojars.org/repo" :creds :gpg :sign-releases false}]]
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.6.0" :scope "compile"]
:plugins [[lein-ancient "0.6.15"]]
:dependencies [[org.clojure/clojure "1.9.0" :scope "compile"]
[boot/base ~version :scope "provided"]
[boot/pod ~version :scope "compile"]
[com.cemerick/pomegranate "1.0.0" :scope "compile"]
[org.apache.maven.wagon/wagon-http "2.12" :scope "compile"
[com.cemerick/pomegranate "1.1.0" :scope "compile"]
[org.apache.maven.wagon/wagon-http "3.3.2" :scope "compile"
:exclusions [org.apache.maven.wagon/wagon-provider-api]]])
8 changes: 4 additions & 4 deletions boot/core/build.boot
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
(set-env!
:source-paths #{"src" "test"}
:dependencies '[[org.clojure/tools.reader "1.0.0-alpha2"]
[metosin/boot-alt-test "0.3.2" :scope "test"]])
:dependencies '[[org.clojure/tools.reader "1.3.2" :exclusions [org.clojure/clojure]]
[metosin/bat-test "0.4.2" :scope "test"]])

(ns-unmap 'boot.user 'test)

(require '[boot.test :refer [runtests test-report test-exit]]
'[metosin.boot-alt-test :refer [alt-test]]
'[metosin.bat-test :refer [bat-test]]
'boot.task.built-in-test
'boot.test-test)

Expand All @@ -19,7 +19,7 @@
(test-exit)))

(deftask unit-test []
(alt-test :test-matcher #"boot\.cli-test"))
(bat-test :test-matcher #"boot\.cli-test"))

(deftask test []
(comp
Expand Down
9 changes: 4 additions & 5 deletions boot/core/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
(.getProperty "version")))

(defproject boot/core version
:aot :all
:jar-exclusions [#"^clojure/core/"]
:description "Core boot module–boot scripts run in this pod."
:url "https://github.com/boot-clj/boot"
:scm {:url "https://github.com/boot-clj/boot.git" :dir "../../"}
:repositories [["clojars" {:url "https://clojars.org/repo" :creds :gpg :sign-releases false}]]
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.6.0" :scope "provided"]
[boot/base ~version :scope "provided"]
[boot/pod ~version :scope "compile"]])

:plugins [[lein-ancient "0.6.15"]]
:dependencies [[org.clojure/clojure "1.9.0" :scope "provided"]
[boot/base ~version :scope "provided"]
[boot/pod ~version :scope "compile"]])
12 changes: 12 additions & 0 deletions boot/core/src/boot/task/built_in.clj
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,18 @@
(core/with-pass-thru [fs]
@repl-soc)))

(core/deftask prepl-server
"Start a prepl server.

This task is a thin wrapper around the `socket-server` task. See the
docstring for `socket-server` for details."
[b bind ADDR str "The address server listens on."
p port PORT int "The port to listen to."]
(socket-server
:bind bind
:accept 'clojure.core.server/io-prepl
:port port))

(core/deftask pom
"Create project pom.xml file.

Expand Down
1 change: 1 addition & 0 deletions boot/fileset/boot.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BOOT_VERSION=2.8.3
1 change: 1 addition & 0 deletions boot/fileset/build.boot
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(set-env! :source-paths #{"src"})
Loading