Skip to content

Commit b74a4f7

Browse files
committed
project: switch to clojure 1.9 as default
1 parent 9079896 commit b74a4f7

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

project.clj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:scm {:name "git"
88
:url "https://github.com/binaryage/dirac"}
99

10-
:dependencies [[org.clojure/clojure "1.8.0" :scope "provided"]
10+
:dependencies [[org.clojure/clojure "1.9.0-alpha12" :scope "provided"]
1111
[org.clojure/clojurescript "1.9.229" :scope "provided"]
1212
[org.clojure/core.async "0.2.391"]
1313
[org.clojure/tools.logging "0.3.1"]
@@ -56,7 +56,9 @@
5656

5757
; :jvm-opts ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"]
5858

59-
:source-paths ["src/agent"
59+
:source-paths ["scripts"
60+
61+
"src/agent"
6062
"src/automation"
6163
"src/background"
6264
"src/backport"
@@ -116,14 +118,17 @@
116118
{:dependencies [[org.clojure/clojure "1.7.0" :scope "provided"]
117119
[org.clojure/clojurescript "1.7.228" :scope "provided"]]}
118120

121+
:clojure18
122+
{:dependencies [[org.clojure/clojure "1.8.0" :scope "provided"]]}
123+
119124
:clojure19
120125
{:dependencies [[org.clojure/clojure "1.9.0-alpha12" :scope "provided"]]}
121126

122127
:cooper
123128
{:plugins [[lein-cooper "1.2.2"]]}
124129

125130
:cljs
126-
{:plugins [[lein-cljsbuild "1.1.3"]
131+
{:plugins [[lein-cljsbuild "1.1.4"]
127132
[lein-figwheel "0.5.7"]]
128133
:hooks [leiningen.cljsbuild]}
129134

@@ -375,6 +380,7 @@
375380
"run-backend-tests" ["shell" "scripts/run-backend-tests.sh"]
376381
"run-backend-tests-default" ["with-profile" "+test-runner" "run" "-m" "dirac.backend-tests-runner"]
377382
"run-backend-tests-17" ["with-profile" "+test-runner,+clojure17" "run" "-m" "dirac.backend-tests-runner"]
383+
"run-backend-tests-18" ["with-profile" "+test-runner,+clojure18" "run" "-m" "dirac.backend-tests-runner"]
378384
"run-backend-tests-19" ["with-profile" "+test-runner,+clojure19" "run" "-m" "dirac.backend-tests-runner"]
379385
"run-browser-tests" ["shell" "scripts/run-browser-tests.sh" "dirac.browser-tests-runner"]
380386
"run-browser-tests-dev" ["shell" "scripts/run-browser-tests.sh" "dirac.browser-tests-runner/-dev-main"]

scripts/run-backend-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export DIRAC_AGENT_PORT=12041
1717
export DIRAC_NREPL_WEASEL_PORT=12042
1818

1919
echo "Running backend tests..."
20-
lein run-backend-tests-default
2120
lein run-backend-tests-17
21+
lein run-backend-tests-18
2222
lein run-backend-tests-19
2323

2424
popd

test/browser/src/dirac/browser_tests.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
[clojure.java.shell :as shell]
2929
[clojure.tools.logging :as log]
3030
[clansi])
31-
(import [java.net URLEncoder]))
31+
(:import [java.net URLEncoder]))
3232

3333
; note: we expect current working directory to be dirac root directory ($root)
3434
; $root/test/browser/transcripts/expected/*.txt should contain expected transcripts

0 commit comments

Comments
 (0)