project: switch to clojure 1.9 as default

binaryage · Sep 19, 2016 · b74a4f7 · b74a4f7
1 parent 9079896
commit b74a4f7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/project.clj b/project.clj
@@ -7,7 +7,7 @@
   :scm {:name "git"
         :url  "https://github.com/binaryage/dirac"}
 
-  :dependencies [[org.clojure/clojure "1.8.0" :scope "provided"]
+  :dependencies [[org.clojure/clojure "1.9.0-alpha12" :scope "provided"]
                  [org.clojure/clojurescript "1.9.229" :scope "provided"]
                  [org.clojure/core.async "0.2.391"]
                  [org.clojure/tools.logging "0.3.1"]
@@ -56,7 +56,9 @@
 
   ;  :jvm-opts ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"]
 
-  :source-paths ["src/agent"
+  :source-paths ["scripts"
+
+                 "src/agent"
                  "src/automation"
                  "src/background"
                  "src/backport"
@@ -116,14 +118,17 @@
              {:dependencies [[org.clojure/clojure "1.7.0" :scope "provided"]
                              [org.clojure/clojurescript "1.7.228" :scope "provided"]]}
 
+             :clojure18
+             {:dependencies [[org.clojure/clojure "1.8.0" :scope "provided"]]}
+
              :clojure19
              {:dependencies [[org.clojure/clojure "1.9.0-alpha12" :scope "provided"]]}
 
              :cooper
              {:plugins [[lein-cooper "1.2.2"]]}
 
              :cljs
-             {:plugins [[lein-cljsbuild "1.1.3"]
+             {:plugins [[lein-cljsbuild "1.1.4"]
                         [lein-figwheel "0.5.7"]]
               :hooks   [leiningen.cljsbuild]}
 
@@ -375,6 +380,7 @@
             "run-backend-tests"          ["shell" "scripts/run-backend-tests.sh"]
             "run-backend-tests-default"  ["with-profile" "+test-runner" "run" "-m" "dirac.backend-tests-runner"]
             "run-backend-tests-17"       ["with-profile" "+test-runner,+clojure17" "run" "-m" "dirac.backend-tests-runner"]
+            "run-backend-tests-18"       ["with-profile" "+test-runner,+clojure18" "run" "-m" "dirac.backend-tests-runner"]
             "run-backend-tests-19"       ["with-profile" "+test-runner,+clojure19" "run" "-m" "dirac.backend-tests-runner"]
             "run-browser-tests"          ["shell" "scripts/run-browser-tests.sh" "dirac.browser-tests-runner"]
             "run-browser-tests-dev"      ["shell" "scripts/run-browser-tests.sh" "dirac.browser-tests-runner/-dev-main"]

diff --git a/scripts/run-backend-tests.sh b/scripts/run-backend-tests.sh
@@ -17,8 +17,8 @@ export DIRAC_AGENT_PORT=12041
 export DIRAC_NREPL_WEASEL_PORT=12042
 
 echo "Running backend tests..."
-lein run-backend-tests-default
 lein run-backend-tests-17
+lein run-backend-tests-18
 lein run-backend-tests-19
 
 popd

diff --git a/test/browser/src/dirac/browser_tests.clj b/test/browser/src/dirac/browser_tests.clj
@@ -28,7 +28,7 @@
             [clojure.java.shell :as shell]
             [clojure.tools.logging :as log]
             [clansi])
-  (import [java.net URLEncoder]))
+  (:import [java.net URLEncoder]))
 
 ; note: we expect current working directory to be dirac root directory ($root)
 ; $root/test/browser/transcripts/expected/*.txt should contain expected transcripts