Release 2.3.0

NEWS.md

@@ -1,6 +1,6 @@
 # Leiningen News -- history of user-visible changes
 
-## 2.3.0 / ???
+## 2.3.0 / 2013-08-08
 
 * Add `:eval-in :pprint` for debugging. (Phil Hagelberg)
 * Support cleaning extra dirs with `:clean-targets`. (Yoshinori Kohyama)

bin/lein

@@ -4,7 +4,7 @@
 # somewhere on your $PATH, like ~/bin. The rest of Leiningen will be
 # installed upon first run into the ~/.lein/self-installs directory.
 
-export LEIN_VERSION="2.2.1-SNAPSHOT"
+export LEIN_VERSION="2.3.0"
 
 case $LEIN_VERSION in
     *SNAPSHOT) SNAPSHOT="YES" ;;

bin/lein.bat

@@ -2,7 +2,7 @@
 
 setLocal EnableExtensions EnableDelayedExpansion
 
-set LEIN_VERSION=2.2.1-SNAPSHOT
+set LEIN_VERSION=2.3.0
 
 if "%LEIN_VERSION:~-9%" == "-SNAPSHOT" (
     set SNAPSHOT=YES

bin/release

@@ -2,24 +2,26 @@
 
 set -e -u
 
-CURRENT_VERSION=$1
-RELEASE_VERSION=$2
+RELEASE_VERSION=$1
+CURRENT_VERSION="$RELEASE_VERSION-SNAPSHOT"
 
 for f in bin/lein bin/lein-pkg bin/lein.bat project.clj leiningen-core/project.clj; do
     sed -i s/$CURRENT_VERSION/$RELEASE_VERSION/ $f
 done
 
-rm -rf target classes leiningen-core/target leiningen-core/classes
+rm -rf target classes leiningen-core/target leiningen-core/classes leiningen-core/lib
 rm -rf $HOME/.lein/self-installs/leiningen-$RELEASE_VERSION-standalone.jar
 
+LEIN_ROOT=$PWD
+
 cd leiningen-core
 sed -i s/\;\;:aot/:aot/ project.clj
 lein1 clean, install
 sed -i s/:aot/\;\;:aot/ project.clj
 cd ..
 
-bin/lein with-profile release uberjar
-cp target/release+uberjar/leiningen-$RELEASE_VERSION-standalone.jar $HOME/.lein/self-installs
+bin/lein uberjar
+cp target/leiningen-$RELEASE_VERSION-standalone.jar $HOME/.lein/self-installs
 
 cp bin/lein /tmp/lein-$RELEASE_VERSION
 cd /tmp
@@ -36,18 +38,16 @@ time ../lein-$RELEASE_VERSION run -m clojure.main/main -e nil
 
 echo "If these are under 3 seconds then you should be set to upload"
 echo "target/leiningen-$RELEASE_VERSION-standalone.jar to S3."
-echo "s3c me put -P target/release+uberjar/leiningen-$RELEASE_VERSION-standalone.jar s3://leiningen/downloads/"
-echo "Also deploy this release of leiningen-core to Clojars."
+echo "s3c me put -P target/leiningen-$RELEASE_VERSION-standalone.jar s3://leiningen/downloads/"
+echo "Also deploy this release to Clojars."
 
-cd -
+cd $LEIN_ROOT
 
 git commit -a -m "Release $RELEASE_VERSION"
 git tag -s $RELEASE_VERSION -m "Release $RELEASE_VERSION"
 
 # Still manual for now:
-# cd leiningen-core; lein do clean, deploy clojars, marg
 # deploy leiningen itself
-# scp docs/uberdoc.html [email protected]:leiningen.org/reference.html
 # git push && git push --tags
 # git checkout stable && git merge master && git push
 # Drop version back to SNAPSHOT

leiningen-core/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>leiningen-core</groupId>
   <artifactId>leiningen-core</artifactId>
-  <version>2.2.0</version>
+  <version>2.3.0</version>
   <name>leiningen-core</name>
   <description>Library for core functionality of Leiningen.</description>
   <url>https://github.com/technomancy/leiningen</url>
@@ -58,11 +58,6 @@
       <artifactId>classlojure</artifactId>
       <version>0.6.6</version>
     </dependency>
-    <dependency>
-      <groupId>useful</groupId>
-      <artifactId>useful</artifactId>
-      <version>0.8.6</version>
-    </dependency>
     <dependency>
       <groupId>robert</groupId>
       <artifactId>hooke</artifactId>
@@ -81,7 +76,12 @@
     <dependency>
       <groupId>com.hypirion</groupId>
       <artifactId>io</artifactId>
-      <version>0.2.0-RC1</version>
+      <version>0.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>pedantic</groupId>
+      <artifactId>pedantic</artifactId>
+      <version>0.1.0</version>
     </dependency>
   </dependencies>
 </project>

leiningen-core/project.clj

@@ -1,4 +1,4 @@
-(defproject leiningen-core "2.2.1-SNAPSHOT"
+(defproject leiningen-core "2.3.0"
   :url "https://github.com/technomancy/leiningen"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}

project.clj

@@ -1,12 +1,12 @@
 ;; This is Leiningen's own project configuration. See doc/TUTORIAL.md
 ;; file as well as sample.project.clj for help writing your own.
 
-(defproject leiningen "2.2.1-SNAPSHOT"
+(defproject leiningen "2.3.0"
   :description "Automate Clojure projects without setting your hair on fire."
   :url "https://github.com/technomancy/leiningen"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[leiningen-core "2.2.1-SNAPSHOT"]
+  :dependencies [[leiningen-core "2.3.0"]
                  [org.clojure/data.xml "0.0.3"]
                  [bultitude "0.2.2"]
                  [stencil "0.3.2"]
@@ -23,13 +23,11 @@
   ;; checkout-deps don't work with :eval-in :leiningen
   :profiles {:dev {:resource-paths ["leiningen-core/dev-resources"]
                    :test-paths ["leiningen-core/test"]}
-             :release {:aot [#"leiningen"
+             :uberjar {:aot [#"leiningen"
                              cemerick.pomegranate
-                             cemerick.drawbridge
                              classlojure.core
                              clojure.tools.nrepl
-                             clj-http.core
-                             ordered.map]}}
+                             clj-http.core]}}
   :test-selectors {:default (complement :disabled)
                    :offline (comp (partial not-any? identity)
                                   (juxt :online :disabled))}