Skip to content

Commit

Permalink
Upgrade clojure dependency to 1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephen Nelson committed Jul 16, 2015
1 parent 4ab6de9 commit 6e0ebc2
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion doc/PLUGINS.md
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ middleware.

## Clojure Version

Leiningen 2.4.0 and on uses Clojure 1.6.0. If you need to use a
Leiningen 2.5.2 and on uses Clojure 1.7.0. If you need to use a
different version of Clojure from within a Leiningen plugin, you can
use `eval-in-project` with a dummy project argument:

Expand Down
2 changes: 1 addition & 1 deletion leiningen-core/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:description "Library for core functionality of Leiningen."
:dependencies [[org.clojure/clojure "1.6.0"]
:dependencies [[org.clojure/clojure "1.7.0"]
[bultitude "0.2.6"]
[classlojure "0.6.6"]
[robert/hooke "1.3.0"]
Expand Down
2 changes: 1 addition & 1 deletion resources/leiningen/new/app/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:url "http://example.com/FIXME"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.6.0"]]
:dependencies [[org.clojure/clojure "1.7.0"]]
:main ^:skip-aot {{namespace}}
:target-path "target/%s"
:profiles {:uberjar {:aot :all}})
2 changes: 1 addition & 1 deletion resources/leiningen/new/default/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
:url "http://example.com/FIXME"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.6.0"]])
:dependencies [[org.clojure/clojure "1.7.0"]])
2 changes: 1 addition & 1 deletion test/leiningen/test/test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
(let [project (project/merge-profiles sample-failing-project
[{:aot ^:replace []
:dependencies ^:replace
[['org.clojure/clojure "1.6.0"]]}])]
[['org.clojure/clojure "1.7.0"]]}])]
(binding [main/*exit-process?* false]
(is (= "EOF while reading" (try (test project) false
(catch Exception e
Expand Down
4 changes: 2 additions & 2 deletions test/leiningen/test/update_in.clj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
":repl-options:port" "inc" "--" "repl" ":headless"]
["repl" (prj-map {:repl-options {:port 2}}) ":headless"]

[(prj-map {:dependencies [['clojure.core "1.6.0"]]})
[(prj-map {:dependencies [['clojure.core "1.7.0"]]})
":dependencies" "conj" "[slamhound \"1.1.3\"]" "--" "repl"]
["repl" (prj-map {:dependencies [['clojure.core "1.6.0"]
["repl" (prj-map {:dependencies [['clojure.core "1.7.0"]
['slamhound "1.1.3"]]})]]
(partition 2))]
(let [[in-prj key-path f & args] in-args
Expand Down
2 changes: 1 addition & 1 deletion test_projects/bad-require/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
:url "http://example.com/FIXME"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.6.0"]]
:dependencies [[org.clojure/clojure "1.7.0"]]
:main bad-require.core)
2 changes: 1 addition & 1 deletion test_projects/file-not-found-thrower/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
:url "http://example.com/FIXME"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.6.0"]])
:dependencies [[org.clojure/clojure "1.7.0"]])
2 changes: 1 addition & 1 deletion test_projects/java-main/project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject java-main "0.1.0-SNAPSHOT"
:java-source-paths ["src/java"]
:dependencies [[org.clojure/clojure "1.6.0"]] ;; lein run errors if not there.
:dependencies [[org.clojure/clojure "1.7.0"]] ;; lein run errors if not there.
:main my.java.Main)
2 changes: 1 addition & 1 deletion test_projects/jvm-opts/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

(defproject custom/args "0.0.1-SNAPSHOT"
:description "A test project"
:dependencies [[org.clojure/clojure "1.6.0"]]
:dependencies [[org.clojure/clojure "1.7.0"]]
:profiles {:no-op {}
:ascii {:jvm-opts ["-Dfile.encoding=ASCII"]}})
2 changes: 1 addition & 1 deletion test_projects/more-gen-classes/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
:url "http://example.com/FIXME"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.6.0"]])
:dependencies [[org.clojure/clojure "1.7.0"]])
2 changes: 1 addition & 1 deletion test_projects/uberjar-merging/project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
;; "lein new".

(defproject nomnomnom "0.5.0-SNAPSHOT"
:dependencies [[org.clojure/clojure "1.6.0"]
:dependencies [[org.clojure/clojure "1.7.0"]
[janino "2.5.15"]
[org.platypope/method-fn "0.1.0"]]
:uberjar-exclusions [#"DUMMY"]
Expand Down

0 comments on commit 6e0ebc2

Please sign in to comment.