Update .travis.yml, adjust for compatibility

Author: Yannick Scherer

.travis.yml

@@ -1,7 +1,8 @@
 language: clojure
-script: lein all midje
+script: lein all test
 jdk:
   - openjdk7
   - oraclejdk7
   - openjdk8
   - oraclejdk8
+  - oraclejdk9

project.clj

@@ -6,16 +6,16 @@
             :year 2013
             :key "mit"}
   :repositories  {"sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"}
-  :dependencies [[org.clojure/clojure "1.8.0" :scope "provided"]
+  :dependencies [[org.clojure/clojure "1.9.0" :scope "provided"]
                  [org.clojure/tools.reader "1.2.2"]]
-  :profiles {:dev {:dependencies [[org.clojure/test.check "0.9.0"]]
+  :profiles {:dev {:dependencies [[org.clojure/test.check "0.7.0"]]
                    :plugins [[codox "0.8.10"]]
                    :exclusions [org.clojure/clojure]
                    :codox {:project {:name "rewrite-clj"}
                            :defaults {:doc/format :markdown}}}
              :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}
              :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
-             :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}}
-  :aliases {"all" ["with-profile" "dev,1.5:dev,1.6:dev,1.7"]
-            "test-ancient" ["with-profile" "dev,1.5:dev,1.6:dev,1.7" "midje"]}
+             :1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
+             :1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}}
+  :aliases {"all" ["with-profile" "dev,1.5:dev,1.6:dev,1.7:dev,1.8"]}
   :pedantic? :abort)

test/rewrite_clj/examples/cljx_test.clj

@@ -20,8 +20,8 @@
   (are [?data ?pred]
        (let [loc (z/of-string ?data)]
          (is (?pred (cljx-macro? loc))))
-    "#+clj 123"           some?
-    "#-clj 123"           some?
+    "#+clj 123"           identity
+    "#-clj 123"           identity
     "#clj  123"           not
     "123"                 not))
 

test/rewrite_clj/zip/move_test.clj

@@ -10,17 +10,17 @@
          (let [loc ((apply comp (reverse ?ops)) root)]
            (is (= ?sexpr (base/sexpr loc)))
            (is (?pred loc)))
-      [m/down]                          1           some?
+      [m/down]                          1           identity
       [m/next]                          1           (complement m/end?)
       [m/next m/next]                   [2 3]       (complement m/end?)
       [m/down m/right m/right]          4           (complement m/end?)
       [m/down m/rightmost]              4           m/rightmost?
       [m/down m/rightmost m/rightmost]  4           m/rightmost?
       [m/down m/leftmost]               1           m/leftmost?
       [m/down m/right m/leftmost]       1           m/leftmost?
-      [m/down m/next m/next m/up]       [2 3]       some?
+      [m/down m/next m/next m/up]       [2 3]       identity
       [m/down m/next m/next m/up m/up]  [1 [2 3] 4] #(and (m/leftmost? %) (m/rightmost? %))
-      [m/down m/rightmost m/prev]       3           some?
+      [m/down m/rightmost m/prev]       3           identity
       [m/down m/rightmost m/next]       4           m/end?)))
 
 (deftest t-moving-into-an-empty-inner-node