diff --git a/doc/PLUGINS.md b/doc/PLUGINS.md index 05032f5dc..0b0df90dc 100644 --- a/doc/PLUGINS.md +++ b/doc/PLUGINS.md @@ -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: diff --git a/leiningen-core/project.clj b/leiningen-core/project.clj index 49f34491e..2802d3cc2 100644 --- a/leiningen-core/project.clj +++ b/leiningen-core/project.clj @@ -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"] diff --git a/resources/leiningen/new/app/project.clj b/resources/leiningen/new/app/project.clj index b6b72d31e..8155bc780 100644 --- a/resources/leiningen/new/app/project.clj +++ b/resources/leiningen/new/app/project.clj @@ -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}}) diff --git a/resources/leiningen/new/default/project.clj b/resources/leiningen/new/default/project.clj index 220f2ae11..cefa11f49 100644 --- a/resources/leiningen/new/default/project.clj +++ b/resources/leiningen/new/default/project.clj @@ -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"]]) diff --git a/test/leiningen/test/test.clj b/test/leiningen/test/test.clj index 685e6b45c..8afda132b 100644 --- a/test/leiningen/test/test.clj +++ b/test/leiningen/test/test.clj @@ -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 diff --git a/test/leiningen/test/update_in.clj b/test/leiningen/test/update_in.clj index 51931ee5a..cc2c78ccf 100644 --- a/test/leiningen/test/update_in.clj +++ b/test/leiningen/test/update_in.clj @@ -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 diff --git a/test_projects/bad-require/project.clj b/test_projects/bad-require/project.clj index 0e0d3de32..a331f2d2c 100644 --- a/test_projects/bad-require/project.clj +++ b/test_projects/bad-require/project.clj @@ -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) diff --git a/test_projects/file-not-found-thrower/project.clj b/test_projects/file-not-found-thrower/project.clj index 6065acf9d..2195c0789 100644 --- a/test_projects/file-not-found-thrower/project.clj +++ b/test_projects/file-not-found-thrower/project.clj @@ -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"]]) diff --git a/test_projects/java-main/project.clj b/test_projects/java-main/project.clj index c3f769fef..1c67ea2f3 100644 --- a/test_projects/java-main/project.clj +++ b/test_projects/java-main/project.clj @@ -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) diff --git a/test_projects/jvm-opts/project.clj b/test_projects/jvm-opts/project.clj index 273c5ded9..08b037ce4 100644 --- a/test_projects/jvm-opts/project.clj +++ b/test_projects/jvm-opts/project.clj @@ -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"]}}) diff --git a/test_projects/more-gen-classes/project.clj b/test_projects/more-gen-classes/project.clj index d080c4348..19f03949b 100644 --- a/test_projects/more-gen-classes/project.clj +++ b/test_projects/more-gen-classes/project.clj @@ -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"]]) diff --git a/test_projects/uberjar-merging/project.clj b/test_projects/uberjar-merging/project.clj index 37169292f..ef113f63d 100644 --- a/test_projects/uberjar-merging/project.clj +++ b/test_projects/uberjar-merging/project.clj @@ -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"]