Skip to content

Commit

Permalink
Release 2.9.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@technomancy
technomancy committed Mar 16, 2020
1 parent 3ec95ca commit d4aec40
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions bin/lein
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ function msg {
echo "$@" 1>&2
}

export LEIN_VERSION="2.9.3-SNAPSHOT"
export LEIN_VERSION="2.9.3"
# Must be sha256sum, will be replaced by bin/release
export LEIN_CHECKSUM='09805bd809656794cfe7d9155fd4b8bea2646092318690bf68e3c379574a2d3c'
export LEIN_CHECKSUM='23e1df18bc97226d570f47335a8d543e1b759ea303544ea57d5309be3dedcbbb'

case $LEIN_VERSION in
*SNAPSHOT) SNAPSHOT="YES" ;;
Expand Down
2 changes: 1 addition & 1 deletion bin/lein-pkg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# It has all the cross-platform stuff stripped out as well as the
# logic for running from a source checkout and self-install/upgrading.

export LEIN_VERSION="2.9.3-SNAPSHOT"
export LEIN_VERSION="2.9.3"

# cd to the project root, if applicable
NOT_FOUND=1
Expand Down
2 changes: 1 addition & 1 deletion bin/lein-sdkman
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# This variant of the lein script is meant for consumption by SDKMAN!
# (i.e. a script which supports all platforms with bash installed)
export LEIN_VERSION="2.9.3-SNAPSHOT"
export LEIN_VERSION="2.9.3"

if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
delimiter=";"
Expand Down
2 changes: 1 addition & 1 deletion bin/lein.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setLocal EnableExtensions EnableDelayedExpansion

set LEIN_VERSION=2.9.3-SNAPSHOT
set LEIN_VERSION=2.9.3

if "%LEIN_VERSION:~-9%" == "-SNAPSHOT" (
set SNAPSHOT=YES
Expand Down
2 changes: 1 addition & 1 deletion bin/lein.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function Set-ParentLocation([string]$file)

function Initialize-Environment
{
$env:LEIN_VERSION = '2.9.3-SNAPSHOT'
$env:LEIN_VERSION = '2.9.3'
$env:SNAPSHOT = if($env:LEIN_VERSION -like '*-SNAPSHOT'){'YES'}else{'NO'} #TODO: Still needed?
$env:ORIGINAL_PWD = $PWD -replace '\\$','\\'
Set-ParentLocation project.clj
Expand Down
12 changes: 7 additions & 5 deletions leiningen-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>leiningen-core</groupId>
<artifactId>leiningen-core</artifactId>
<packaging>jar</packaging>
<version>2.9.3-SNAPSHOT</version>
<version>2.9.3</version>
<name>leiningen-core</name>
<description>Library for core functionality of Leiningen.</description>
<url>https://github.com/technomancy/leiningen</url>
Expand All @@ -14,7 +14,9 @@
</license>
</licenses>
<scm>
<tag>df32368a84c3441b59d0310a991a3e10c91b28b8</tag>
<tag>3ec95ca59df4dbc96fe28ec1a31e8eb988d1ca9e
</tag>
<url/>
</scm>
<build>
<sourceDirectory>src</sourceDirectory>
Expand Down Expand Up @@ -46,7 +48,7 @@
</repository>
<repository>
<id>clojars</id>
<url>https://repo.clojars.org/</url>
<url>https://clojars.org/repo/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
Expand All @@ -70,8 +72,8 @@
<version>0.3.0</version>
<exclusions>
<exclusion>
<artifactId>clojure</artifactId>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -91,8 +93,8 @@
<version>1.2.0</version>
<exclusions>
<exclusion>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion leiningen-core/project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject leiningen-core "2.9.3-SNAPSHOT"
(defproject leiningen-core "2.9.3"
:url "https://github.com/technomancy/leiningen"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
Expand Down
2 changes: 1 addition & 1 deletion project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;; 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.9.3-SNAPSHOT"
(defproject leiningen "2.9.3"
:description "Automate Clojure projects without setting your hair on fire."
:url "https://github.com/technomancy/leiningen"
:license {:name "Eclipse Public License"
Expand Down

7 comments on commit d4aec40

@glts
Copy link
Collaborator

@glts glts commented on d4aec40 Mar 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@technomancy Something strange happened with this release … the Leiningen version is 2.9.3, but the leiningen-core lib that was included in the release is an older version, 2.9.1.

Now I see that 2.9.2 had the same problem, so perhaps that was the reason for some of the trouble we had with it.

@glts
Copy link
Collaborator

@glts glts commented on d4aec40 Mar 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unfortunately I think that means we need another release …

@technomancy
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify what you mean here? I'm seeing changes from 2.9.3 in the released uberjar.

@glts
Copy link
Collaborator

@glts glts commented on d4aec40 Mar 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I also see most things are as should be. But when you start a REPL, it uses Clojure 1.10.0 instead of 1.10.1. Then when you open the Leiningen standalone JAR you can see that the POM/project.clj reference leiningen-core 2.9.1, where we still had Clojure 1.10.0. I would not expect any references to leiningen-core 2.9.1 in the standalone JAR.

@nihilismus
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After executing: mkdir -p /tmp/lein-jar; cd /tmp/lein-jar; unzip -qo $HOME/.lein/self-installs/leiningen-2.9.3-standalone.jar

  • with grep -IEr '2\.9\.1' I get :
leiningen/help/news:## 2.9.1 / 2019-02-26
META-INF/leiningen/leiningen-core/leiningen-core/project.clj:(defproject leiningen-core "2.9.1"
META-INF/leiningen/leiningen/leiningen/project.clj:  :dependencies [[leiningen-core "2.9.1"]
META-INF/maven/commons-codec/commons-codec/pom.xml:        <!-- Use 2.9.1 instead of 2.10; 2.10 seems to scan the 'target' 
META-INF/maven/commons-codec/commons-codec/pom.xml:        <version>2.9.1</version>
META-INF/maven/commons-codec/commons-codec/pom.xml:        <!-- We need to specify reportSets because 2.9.1 creates two reports -->
META-INF/maven/leiningen-core/leiningen-core/pom.properties:version=2.9.1
META-INF/maven/leiningen-core/leiningen-core/pom.xml:  <version>2.9.1</version>
META-INF/maven/leiningen/leiningen/pom.xml:      <version>2.9.1</version>
  • with grep -IEr '1\.10\.0' I get:
clojure/version.properties:version=1.10.0
leiningen/help/tutorial:    Clojure 1.10.0
leiningen/help/news:* Use Clojure 1.10.0 for plugins and new templates projects. (Alex Miller, Phil Hagelberg)
META-INF/leiningen/nrepl/nrepl/project.clj:             :provided {:dependencies [[org.clojure/clojure "1.10.0"]]}
META-INF/leiningen/nrepl/nrepl/project.clj:             :1.10 {:dependencies [[org.clojure/clojure "1.10.0"]]}
META-INF/leiningen/leiningen-core/leiningen-core/project.clj:  :dependencies [[org.clojure/clojure "1.10.0"]
META-INF/maven/nrepl/nrepl/pom.xml:      <version>1.10.0</version>
META-INF/maven/leiningen-core/leiningen-core/pom.xml:      <version>1.10.0</version>
META-INF/maven/org.clojure/clojure/pom.properties:version=1.10.0
META-INF/maven/org.clojure/clojure/pom.xml:  <version>1.10.0</version>
META-INF/maven/org.clojure/clojure/pom.xml:    <tag>clojure-1.10.0</tag>
  • and with grep -IEr '1\.10\.1' I get:
leiningen/help/news:* Bump to Clojure 1.10.1. (Phil Hagelberg)
leiningen/new/default/project.clj:  :dependencies [[org.clojure/clojure "1.10.1"]]
leiningen/new/app/project.clj:  :dependencies [[org.clojure/clojure "1.10.1"]]

@glts Is this what you are referring to?

@glts
Copy link
Collaborator

@glts glts commented on d4aec40 Mar 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nihilismus Yeah. I don't know what the impact is, I just noticed the wrong Clojure version with lein repl.

@pmonks
Copy link
Contributor

@pmonks pmonks commented on d4aec40 Apr 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@glts one impact is that bugs in v1.10.0 will affect all Leiningen plugins (since plugins run on the Clojure version depended on by Leiningen itself, rather than that depended on by the project). This has bitten me in at least one instance, described here: noisesmith/lein-git-info-edn#3 This one involves a regression in v1.10.0 involving (pr-str) of java.util.Date instances (this worked in earlier versions, and was addressed in v1.10.1).

Please sign in to comment.