Reduce some contrib dependencies.

src/leiningen/checkout_deps.clj

@@ -1,6 +1,6 @@
 (ns leiningen.checkout-deps
   (:use [leiningen.core :only [read-project]]
-        [clojure.contrib.io :only [file]]))
+        [clojure.java.io :only [file]]))
 
 (defn checkout-deps-paths [project]
   (apply concat (for [dep (.listFiles (file (:root project) "checkouts"))]

src/leiningen/compile.clj

@@ -4,7 +4,7 @@
   (:use  [leiningen.deps :only [deps]]
          [leiningen.core :only [ns->path run-task]]
          [leiningen.classpath :only [make-path find-lib-jars get-classpath]]
-         [clojure.contrib.io :only [file]]
+         [clojure.java.io :only [file]]
          [clojure.contrib.find-namespaces :only [find-namespaces-in-dir]])
   (:refer-clojure :exclude [compile])
   (:import org.apache.tools.ant.taskdefs.Java

src/leiningen/deps.clj

@@ -2,7 +2,7 @@
   "Install jars for all dependencies in lib."
   (:require [lancet])
   (:use [leiningen.pom :only [default-repos make-dependency]]
-        [clojure.contrib.io :only [file]])
+        [clojure.java.io :only [file]])
   (:import [org.apache.maven.artifact.ant DependenciesTask RemoteRepository]
            [org.apache.tools.ant.util FlatFileNameMapper]))
 

src/leiningen/install.clj

@@ -3,7 +3,7 @@
   (:use [leiningen.core :only [run-task]]
         [leiningen.jar :only [jar]]
         [leiningen.pom :only [pom make-model]]
-        [clojure.contrib.io :only [file]])
+        [clojure.java.io :only [file]])
   (:import [org.apache.maven.artifact.installer ArtifactInstaller]
            [org.apache.maven.project.artifact ProjectArtifactMetadata]
            [org.apache.maven.settings MavenSettingsBuilder]

src/leiningen/new.clj

@@ -4,7 +4,7 @@ lein new [group-id/]artifact-id [project-dir]
 Group-id is optional. Project-dir defaults to artifact-id if not given.
 Neither group-id nor artifact-id may contain slashes."
   (:use [leiningen.core :only [ns->path]]
-        [clojure.contrib.io :only [spit file]]
+        [clojure.java.io :only [file]]
         [clojure.contrib.string :only [join]]))
 
 (defn new

src/leiningen/pom.clj

@@ -1,6 +1,6 @@
 (ns leiningen.pom
   "Write a pom.xml file to disk for Maven interop."
-  (:use [clojure.contrib.io :only [reader copy file]]
+  (:use [clojure.java.io :only [reader copy file]]
         [clojure.contrib.properties :only [as-properties]])
   (:import [java.io StringWriter ByteArrayOutputStream]
            [org.apache.maven.model Build Model Parent Dependency

src/leiningen/test.clj

@@ -1,7 +1,7 @@
 (ns leiningen.test
   "Run the project's tests."
   (:refer-clojure :exclude [test])
-  (:use [clojure.contrib.io :only [file]]
+  (:use [clojure.java.io :only [file]]
         [clojure.contrib.find-namespaces :only [find-namespaces-in-dir]]
         [leiningen.compile :only [eval-in-project]]))
 

src/leiningen/uberjar.clj

@@ -2,7 +2,7 @@
   "Create a jar containing the compiled code, source, and all dependencies."
   (:require [clojure.xml :as xml])
   (:use [clojure.zip :only [xml-zip]]
-        [clojure.contrib.io :only [file copy]]
+        [clojure.java.io :only [file copy]]
         [clojure.contrib.zip-filter.xml :only [xml-> tag=]]
         [leiningen.core :only [run-task]]
         [leiningen.jar :only [jar]])