Commit graph

4110 commits

Author SHA1 Message Date
Jean Niklas L'orange
51f80c1298 Clojure 1.8.0 2016-01-21 11:08:58 +01:00
Jean Niklas L'orange
31021f411d Explain how to read your project map at runtime
Closes #2033 I think?
2016-01-18 23:59:36 +01:00
Jean Niklas L'orange
3b8d6093aa Tell people to use profiles over middleware
Along with replacing the unfortunate :injections example (ref #2033).
2016-01-18 23:13:26 +01:00
Jean Niklas L'orange
5cce823268 Merge pull request #2063 from arichiardi/gpg-piping-fix
Gpg piping fix
2016-01-11 10:16:17 +01:00
Andrea Richiardi
e8e5e78687 Bind *read-eval* false when reading gpg credentials 2016-01-10 17:28:39 -08:00
Andrea Richiardi
12b44df3e7 Avoid piping std out when reading gpg credentials, ref #2062 2016-01-10 17:28:12 -08:00
Jean Niklas L'orange
89d56d50d5 Update CONTRIBUTING.md, ref #2060
[ci skip]
2016-01-07 10:59:13 +01:00
Jean Niklas L'orange
01fc44acdd Merge pull request #2026 from winks/leiningen-1865
Reset ERRORLEVEL and RC in lein.bat
2016-01-05 19:15:03 +01:00
Jean Niklas L'orange
4a8dffac46 Merge pull request #2050 from cprice404/bug/master/2043-support-snapshots-on-qualifiers
(#2043) `release` task: support SNAPSHOTs on qualifiers
2016-01-04 22:27:54 +01:00
Florian Anderiasch
cb5f49b45c Merge pull request #2056 from winks/copyright-2016
Bump copyright years
2016-01-03 00:44:38 +01:00
Florian Anderiasch
f5682f543c Bump copyright years 2016-01-03 00:43:46 +01:00
Chris Price
ef4e178f81 (#2043) release task: support SNAPSHOTs on qualifiers
Prior to this commit, the `lein release` task was not
really usable for releases that had qualifiers such
as `-alpha1`, `-beta2`, or `-RC1`.

The reason for this is that the code for parsing the
semver could not handle a qualifier like `-alpha1`
AND a `-SNAPSHOT` qualifier at the same time.

The default `:release-tasks` include a `bump-version`
at the `:release` level, and then the release, and
then a `bump-version` at the `:patch` level.  If
you had a version that started out as `1.0.0-alpha1` *or*
`1.0.0-alpha1-SNAPSHOT`, then the `:release` bump
would always set the version to `1.0.0`.  Then the
actual release would occur, and then the `:patch` bump
would take you to `1.0.1-SNAPSHOT`.

With this commit, `qualifier` and `snapshot` are
separated into two separate fields in the version map.
This allows us to modify the `bump-version` behavior
so that it works as one would expect with a qualifier
like `alpha`:

```clj
(is (= (bump-version "1.0.0-alpha1-SNAPSHOT" :release)
       "1.0.0-alpha1"))
(is (= (bump-version "1.0.0-alpha1")
       "1.0.0-alpha2-SNAPSHOT"))
```

This allows the default `:release-tasks` setup to be
used with qualifiers like alpha/beta.

The commit also adds a new `level` that can be passed
to the `change` task: `:qualifier`.  If this level
is passed, then the qualifier will be incremented
instead of the major/minor/patch.  It is a superset
of the existing alpha/beta/RC behavior but works with
arbitrary qualifier strings.
2015-12-24 14:25:46 -08:00
Jean Niklas L'orange
054a77af6c Merge pull request #2047 from TrangPham/lein_pkg_opts
Updating lein-pkg jvm opts to match lein
2015-12-20 00:31:09 +01:00
Thu Trang Pham
1f8fded8ea Merge branch 'lein_pkg_opts' of github.com:TrangPham/leiningen into lein_pkg_opts 2015-12-19 18:01:58 -05:00
Thu Trang Pham
49651592ad Updating lein-pkg jvm opts to match lein 2015-12-19 18:01:17 -05:00
Jean Niklas L'orange
a4496915e8 Merge pull request #2046 from TrangPham/master
Adding platform independant sha to lien-pkg
2015-12-19 23:17:13 +01:00
Jean Niklas L'orange
2eba2fb35f Merge pull request #2045 from ryfow/set-agent-keep-alive
Set short timeout on compiler agent thread pool
2015-12-19 23:16:27 +01:00
Thu Trang Pham
13793b5518 Updating lein-pkg jvm opts to match lein 2015-12-18 20:43:43 -08:00
Thu Trang Pham
3335c37ddc Adding platform independant sha to lien-pkg 2015-12-18 20:22:56 -08:00
Ryan Fowler
21ed07a305 Set short timeout on compiler agent thread pool
When namespaces use agents during load time, threads
are started in the agent threadpool which take 60 seconds to
end. This adds up to 60 seconds of stall time after the compile
task runs.

This patch checks to see if clojure.core/set-agent-send-off-executor!
exists, and if so, calls it with a Thread pool that has the keep
alive time set to 100 milliseconds.

Technically this could cause Thread churn, but practically most
namespace loading doesn't fire up enough Threads for thread
instantiation costs to add up to much.
2015-12-18 12:22:14 -06:00
Jean Niklas L'orange
b4161e347f Don't create implicit resource dirs, fixes #2010
Yeah, I know, this is not pretty.
2015-12-17 09:57:07 +01:00
Jean Niklas L'orange
f3ed8e4660 Merge pull request #2032 from danielcompton/upgrade-clj-http-2-0-0
Upgrade clj-http to 2.0.0
2015-12-09 19:12:04 +01:00
Daniel Compton
2ac8694eb1 Upgrade clj-http to 2.0.0
This makes a lot of it's dependencies optional, including tools.reader.
2015-12-09 19:42:54 +13:00
Jean Niklas L'orange
b29b2ea41b Merge pull request #2037 from solicode/issue-2035
Modify tiered-jvm-opts for :base profile
2015-12-05 17:19:12 +01:00
solicode
d8cb708160 Modify tiered-jvm-opts for :base profile
Ensures `-XX:-OmitStackTraceInFastThrow` is always included by default
regardless of user's LEIN_JVM_OPTS. This setting can be overridden in
other profiles by the user.
2015-12-05 21:30:34 +09:00
Jean Niklas L'orange
e9efb0e279 Update task defn information, ref #1913
Afaik there's no need to not pass in a project-like thing as first
argument for tasks.
2015-11-24 00:39:28 +01:00
Jean Niklas L'orange
53f12e8d4b Allow tasks to have vararg-only form, closes #1913
Aliases are higher order, but also attempts to keep track of tasks via
:arglists metadata. The :arglists update function assumed all tasks
would start with a project arg. However, this isn't necessary: A task
may e.g. have the form [& args] and destructure the project arg inside
the function. This caused lein to incorrectly assume that appending more
arguments to the tasks was an error. (The only tasks I know of right now
that does this is mine, so I should probably take the hint)

I also decided to clean up the drop-partial-args function a bit to make
it more readable.
2015-11-24 00:28:28 +01:00
Jean Niklas L'orange
58b5f7248b Remove duplicate profiles before profile merging
When we expand composite profiles, we may end up with multiple identical
profiles in the resulting list. However, we should only merge a profile
at most once. To fix this, we dedupe the list and retain the _last_
profile mentioned. We retain the last instead of the first as this
prioritises the last profile merges, which is somewhat important for
tasks like repl, uberjar, and to some extent `with-profile +foo`.

It might be interesting to see if we can get away from this in 3.0.0,
for example by saying that
(= (merge-profiles project [:a]) (merge-profiles project [:a :a])).

Fixes #1824 and fixes #2001.
2015-11-22 16:19:49 +01:00
Jean Niklas L'orange
59120a4c55 Merge pull request #1998 from emlyn/aot-warning
Don't trigger implicit-aot-warning on regex match
2015-11-22 12:36:59 +01:00
Emlyn Corrin
1cba82001c Convert main symbol to string 2015-11-22 08:53:00 +00:00
Jean Niklas L'orange
fb876c7d49 Print GPG errors when we receive them, ref #1892
This isn't a perfect solution to error messages, as GPG bypasses the
stdin and sends data directly to the terminal. As such, things from
"stdin" is printed immediately, whereas stderr is printed through the
JVM. As a consequence, it's almost always the case that the stdin lines
are printed before the stderr lines, even though GPG usually sends them
in the opposite order. But it should give you a better indication when
something bad has happened.

Issue #1904 may accidentally be solved as well, as we now have a
shutdown hook on GPG.
2015-11-22 02:52:15 +01:00
Jean Niklas L'orange
f822bdacf1 Display progress on artifact signing, closes #1892 2015-11-22 02:33:06 +01:00
Florian Anderiasch
5433965fc8 Merge pull request #2027 from winks/leiningen-1759
Clarify password/passphrase in DEPLOY.md
2015-11-15 21:36:51 +01:00
Florian Anderiasch
d3d8c19812 Clarify password/passphrase in DEPLOY.md 2015-11-15 21:34:20 +01:00
Florian Anderiasch
e2c257552f Reset ERRORLEVEL and RC in lein.bat
Fixed #1865
For reference:
http://blogs.msdn.com/b/oldnewthing/archive/2008/09/26/8965755.aspx
2015-11-15 20:33:12 +01:00
Jean Niklas L'orange
98379a9c85 Merge pull request #2024 into master 2015-11-10 23:09:08 +01:00
Jean Niklas L'orange
374557c70a Set LEIN_JAVA_CMD to JAVA_CMD if set
Also don't mess with export options for JAVA_CMD. It's not set in
lein anymore, so it's effectively a noop.
2015-11-10 23:09:05 +01:00
Florian Anderiasch
db81aed816 Merge pull request #2023 from m9aertner/leiningen-1899
Leiningen 1899
2015-11-10 20:33:05 +01:00
Juergen Hoetzel
ae4f6a87d3 Don't preset JAVA_CMD. Refs #2009
Because on Cygwin JAVA_CMD will be set to an UNIX path. This will result
in a "File not found" exception when the native Leiningen JAVA process
will execute JAVA_CMD.
2015-11-10 00:18:10 +01:00
Matthias Gaertner
ce47c9b913 2.5.2-SNAPSHOT doesn't build on Windows 7 with Java 8 #1899
Checked upgrade command. Condition was wrong and self-modifying batch code
is just ugly.

Testing:
- Remove 2.5.3 JAR file. This will be re-loaded by calling self-install
  on the loaded batch file.
- Execute "bin\lein.bat upgrade 2.5.3".
- The batch file will be reverted to the 2.5.3 state and JAR file loaded.
2015-11-09 01:54:30 +01:00
Matthias Gaertner
3b4079f0e1 2.5.2-SNAPSHOT doesn't build on Windows 7 with Java 8 #1899
Checked on Windows 7 and Windows 8, with Java Oracle 1.8.0_65.
Improved error detection, especially for downloads. Script
returns non-zero exit code on problems now.
Updated wget link. The original URL does not work any longer.
Supplied a known clean download location, including VirusTotal link.
The slightly re-written structure makes this code work with TCC, too,
so this commit should solve #2019, too.
Quoting has been amended so the code works on Leiningen folders that
contain space characters.
2015-11-09 00:28:44 +01:00
Jean Niklas L'orange
204df2d8f6 Merge pull request #2022 from sbondaryev/feature/binary-file-support
support binary files in lein-new
2015-11-08 01:58:45 +01:00
Sergiy BONDARYEV
00e574eaab add raw-resourcer higher order functoin which returns raw-files generator 2015-11-07 23:08:44 +01:00
Sergiy BONDARYEV
1e390727ff change default renderer io/reader -> io/input-stram to support binary files 2015-11-07 14:51:17 +01:00
Matthias Gaertner
927b9bf26c 2.5.2-SNAPSHOT doesn't build on Windows 7 with Java 8 #1899 2015-11-05 23:54:58 +01:00
Jean Niklas L'orange
dde4022c18 Merge pull request #2009 from propan/master
show a better error message when java is not found in PATH
2015-11-02 00:21:05 +01:00
Jean Niklas L'orange
86e985397a Merge branch 'pr/2017' 2015-11-01 23:58:37 +01:00
Jean Niklas L'orange
c6b559ddb5 bump some hidden nrepl deps, ref #2017 2015-11-01 23:57:53 +01:00
Jean Niklas L'orange
936f377b8e Merge pull request #2007 from schmir/fix-non-github-url-parsing
don't parse broken scm params from non-github URLs
2015-11-01 22:52:55 +01:00
Jean Niklas L'orange
3667708c57 Merge pull request #1990 from MichaelBlume/no-auth
allow setting no-auth in settings
2015-11-01 22:50:59 +01:00