Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix tests for bootclasspath.

  • Loading branch information...
commit 2f2bd69b4d47501c40305d3879d0d5c2a03f096a 1 parent 25181be
@technomancy authored
View
2  sample.project.clj
@@ -214,7 +214,7 @@
;; or :classloader (experimental) to avoid starting a subprocess.
:eval-in :leiningen
;; Disable bootclasspath optimization. This improves boot time but interferes
- ;; with using things like pomegranate at runtime.
+ ;; with using things like pomegranate at runtime and using Clojure 1.2.
:bootclasspath false
;; Set parent for working with in a multi-module maven project
:parent [org.example/parent "0.0.1" :relative-path "../parent/pom.xml"]
View
2  test/leiningen/test/deps.clj
@@ -21,7 +21,7 @@
(doseq [[n v] sample-deps]
(delete-file-recursively (m2-dir n v) :silently))
(let [out (with-out-str (deps sample-project ":tree"))]
- (doseq [[name version] '[[org.clojure/clojure "1.1.0"]
+ (doseq [[name version] '[[org.clojure/clojure "1.3.0"]
[ring "1.0.0"]
[ring/ring-core "1.0.0"]
[commons-codec "1.4"]
View
12 test/leiningen/test/pom.clj
@@ -104,7 +104,7 @@
(is (= ["clojure" "rome" "ring"]
(map #(first-in % [:dependency :artifactId])
(deep-content xml [:project :dependencies]))))
- (is (= ["1.1.0" "0.9" "1.0.0"]
+ (is (= ["1.3.0" "0.9" "1.0.0"]
(map #(first-in % [:dependency :version])
(deep-content xml [:project :dependencies]))))))
@@ -120,7 +120,7 @@
(is (= ["clojure" "rome" "ring" "peridot"]
(map #(first-in % [:dependency :artifactId])
(deep-content xml [:project :dependencies]))))
- (is (= ["1.1.0" "0.9" "1.0.0" "0.0.5"]
+ (is (= ["1.3.0" "0.9" "1.0.0" "0.0.5"]
(map #(first-in % [:dependency :version])
(deep-content xml [:project :dependencies]))))
(is (= [nil nil nil "test"]
@@ -139,7 +139,7 @@
(is (= ["clojure" "rome" "ring" "peridot"]
(map #(first-in % [:dependency :artifactId])
(deep-content xml [:project :dependencies]))))
- (is (= ["1.1.0" "0.9" "1.0.0" "0.0.5"]
+ (is (= ["1.3.0" "0.9" "1.0.0" "0.0.5"]
(map #(first-in % [:dependency :version])
(deep-content xml [:project :dependencies]))))
(is (= [nil nil nil "test"]
@@ -165,7 +165,7 @@
(is (= [ "peridot" "clojure" "rome" "ring"]
(map #(first-in % [:dependency :artifactId])
(deep-content xml [:project :dependencies]))))
- (is (= ["0.0.5" "1.1.0" "0.9" "1.0.0"]
+ (is (= ["0.0.5" "1.3.0" "0.9" "1.0.0"]
(map #(first-in % [:dependency :version])
(deep-content xml [:project :dependencies]))))
(is (= ["provided" nil nil nil]
@@ -205,7 +205,7 @@
(is (= [ "peridot" "clojure" "rome" "ring"]
(map #(first-in % [:dependency :artifactId])
(deep-content xml [:project :dependencies]))))
- (is (= ["0.0.5" "1.1.0" "0.9" "1.0.0"]
+ (is (= ["0.0.5" "1.3.0" "0.9" "1.0.0"]
(map #(first-in % [:dependency :version])
(deep-content xml [:project :dependencies]))))
(is (= ["provided" nil nil nil]
@@ -232,7 +232,7 @@
(is (= ["clojure" "rome" "ring" "rome"]
(map #(first-in % [:dependency :artifactId])
(deep-content xml [:project :dependencies]))))
- (is (= ["1.1.0" "0.9" "1.0.0" "0.8"]
+ (is (= ["1.3.0" "0.9" "1.0.0" "0.8"]
(map #(first-in % [:dependency :version])
(deep-content xml [:project :dependencies]))))
(is (= [nil nil nil "test"]
View
2  test_projects/sample/project.clj
@@ -3,7 +3,7 @@
;; just want a basic project to work from, generate a new one with
;; "lein new".
-(def clj-version "1.1.0")
+(def clj-version "1.3.0")
(defproject nomnomnom "0.5.0-SNAPSHOT"
:description "A test project"
View
4 test_projects/sample/src/nom/nom/nom.clj
@@ -3,8 +3,8 @@
(:require [sample2.core])
(:gen-class))
-(when-not (= "1.1.0" (clojure-version))
- (throw (Exception. (str "Not running Clojure 1.1.0 Snapshot: "
+(when-not (= "1.3.0" (clojure-version))
+ (throw (Exception. (str "Not running Clojure 1.3.0: "
(clojure-version)))))
(def unused-proxy (proxy [Object] [] (toString [] "unused")))
View
2  test_projects/sample_no_aot/project.clj
@@ -4,7 +4,7 @@
;; "lein new".
(defproject nomnomnom "0.5.0-SNAPSHOT"
- :dependencies [[org.clojure/clojure "1.2.0"]
+ :dependencies [[org.clojure/clojure "1.3.0"]
[janino "2.5.15"]]
:uberjar-exclusions [#"DUMMY"]
:test-selectors {:default (fn [m] (not (:integration m)))
View
2  test_projects/tricky-name/project.clj
@@ -1,5 +1,5 @@
(defproject org.domain/tricky-name "1.0"
:description "One with a tricky group and project name"
- :dependencies [[org.clojure/clojure "1.2.0"]]
+ :dependencies [[org.clojure/clojure "1.3.0"]]
:shell-wrapper true
:main ^{:skip-aot true} org.domain.tricky-name.core)
Please sign in to comment.
Something went wrong with that request. Please try again.