luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,242 Commits 29 Branches 314 Tags 70 MiB
Commit Graph

10242 Commits

Author SHA1 Message Date
Nepomuk Seiler 4b3b01b959 FIX #1972 add regression test 2018-08-22 17:18:54 +02:00
eugene yokota d08e40bdba
Merge pull request #4325 from eed3si9n/wip/merge-1.2.x 
merge 1.2.x
 2018-08-16 23:38:47 -04:00
eugene yokota 6eb3d9f0fb
Merge pull request #4324 from eed3si9n/wip/bumpvscodemodules 
sbt 1.2.1 and some maintenance npm bumps
 2018-08-16 23:38:25 -04:00
Eugene Yokota 494f384c49 Formatting 2018-08-16 16:36:41 -04:00
Eugene Yokota 42a4ae33f5 Merge branch 'wip/bumpvscodemodules' into wip/merge-1.2.x 2018-08-16 16:26:26 -04:00
eugene yokota 05cecc378c
Merge pull request #173 from smarter/position-range 
xsbti.Position: add startOffset and endOffset
 2018-08-16 16:25:11 -04:00
Eugene Yokota 590dc5e96d Merge branch '1.2.x' into wip/merge-1.2.x 2018-08-16 16:15:15 -04:00
eugene yokota f8beb5fcce
Merge pull request #4323 from jastice/dont-warn-version-override 
don't warn when current sbt version doesn't match version in build.properties
 2018-08-16 16:05:17 -04:00
Eugene Yokota fa3b0f0313 sbt 1.2.1 2018-08-16 15:55:25 -04:00
Eugene Yokota 349f56fed5 Bump modules to address security vulnerability 2018-08-16 15:54:40 -04:00
Justin Kaeser a50e351c58 don't warn when current sbt version doesn't match version in build.properties when version is set by system property. 
mitigates https://github.com/sbt/sbt/issues/4303
 2018-08-16 18:01:54 +03:00
eugene yokota bb8bd7b0ca
Merge pull request #4308 from seratch/fix-typos 
Fix the several typos detected by github.com/client9/misspell
 2018-08-15 10:51:03 -04:00
Arnout Engelen bed2e11d59 Update test to reflect new WindowsDiscoverConfig ctor 2018-08-15 16:19:14 +02:00
Arnout Engelen b699f0fc6f Also look in (x86) 2018-08-15 11:21:30 +02:00
eugene yokota 74f5cdc630
Merge pull request #4300 from Philippus/default-maven-configs 
Set default maven configurations in pom configuration, fixes #1380
 2018-08-14 15:56:45 -04:00
Philippus 1c5fd5bece
Add Custom scope to pom configuration 2018-08-13 22:37:55 +02:00
Guillaume Martres 5e3a102606 xsbti.Position: Also add {start,end}{Line,Column} 
Positions in the Language Server Protocol and Build Server Protocol are
line/column-based instead of offset-based, so this is more convenient.
Computing the line/column from the offset is possible but requires
reading the source file.
 2018-08-14 02:04:55 +09:00
Guillaume Martres 78834527df xsbti.Position: add startOffset and endOffset 
A position now has a start, an end, and a point (the existing `offset`),
just like it does in the Scala compiler. This information is especially
useful for displaying squiggly lines in an IDE.

This commit and the next one are required for https://github.com/sbt/zinc/pull/571
 2018-08-14 02:04:43 +09:00
Guillaume Martres f457696a99 Upgrade to sbt 1.2.1 2018-08-13 01:03:08 +09:00
Arnout Engelen b1fc7dc183 Support discovering JDK 11 in JAVA_HOME for CrossJava 2018-08-09 14:43:11 +02:00
Kazuhiro Sera 4a04764f20 Fix the several typos detected by github.com/client9/misspell 2018-08-08 16:34:45 +09:00
Kazuhiro Sera 59dbc0645e Fix the several typos detected by github.com/client9/misspell 2018-08-08 15:57:34 +09:00
Julien Sirocchi bb49018c52 Fixes #4236 2018-08-07 10:26:56 +01:00
eugene yokota 549c69463d
Merge pull request #4304 from eed3si9n/wip/bump 
Zinc 1.2.1, IO 1.2.1
 2018-08-06 18:52:29 -04:00
Eugene Yokota a1d1c77311 Zinc 1.2.1, IO 1.2.1 2018-08-06 16:46:55 -04:00
eugene yokota 1ebc1a7bfc
Merge pull request #4302 from eed3si9n/wip/remove-configuration-warning 
Remove warnings about configuration
 2018-08-06 08:34:05 -04:00
eugene yokota d4d83a5d6b
Merge pull request #4301 from eed3si9n/wip/vararg 
Revert switch inThisBuild (+friends) to use varargs SettingsDefinition
 2018-08-06 08:13:20 -04:00
Eugene Yokota 780ca366d8 Remove warnings about configuration 
Fixes #4293
Ref #4231, #4065

This fixes the regression on sbt 1.2.0 that displays a lot of warnings about configurations.

The warning was added in #4231 in an attempt to fix #4065. This actually highlights somewhat loose usage of configurations among the builds in the wild, and the limitation on the current slash syntax implementation.

I think we can remove this warning for now, and try to fix #4065 by making slash syntax more robust. In particular, we need to memorize the mapping between the configuration name and Scala identifier across the entire build, and use that in the shell.
 2018-08-06 00:22:57 -04:00
Eugene Yokota 26c180e768 Revert "Switch inThisBuild (+friends) to use varargs SettingsDefinition" 
This reverts commit f459b218c4.
 2018-08-05 16:00:33 -04:00
Eugene Yokota eac7eef947 Revert "Switch to varargs inThisBuild (+friends)" 
This reverts commit ccf938c786.
 2018-08-05 15:44:37 -04:00
Philippus 15e6cdfd68
Set default maven configurations in pom configuration, fixes #1380 2018-08-05 09:25:33 +02:00
Johannes Rudolph 3cfb4a110c
Merge pull request #158 from MasseGuillaume/patch-2 
Avoid http redirect in dependencyBrowseGraph
 2018-08-03 15:43:58 +02:00
Guillaume Massé 23e1480e07
Avoid http redirect in dependencyBrowseGraph 
I published a dependency graph at https://github.com/MasseGuillaume/spark-dependency-graph

and I noticed that https://cpettitt.github.io/project/graphlib-dot/v0.6.1/graphlib-dot.js redirects to
http://www.samsarin.com/project/graphlib-dot/v0.6.1/graphlib-dot.js

this causes the script to fail over insecure content.
 2018-08-03 14:03:55 +02:00
Dale Wijnand 39070c18e2
Merge pull request #172 from dwijnand/lenient-StringTypeTag 
Make checkTypeTag lenient on "scala." type prefix
 2018-08-02 08:08:16 +01:00
Dale Wijnand b1d02bee30
Make checkTypeTag lenient on "scala." type prefix 2018-08-02 07:52:13 +01:00
eugene yokota 6a9c7c934e
Merge pull request #171 from eed3si9n/wip/next 
1.2.1-SNAPSHOT
 2018-08-01 00:29:23 -04:00
Eugene Yokota 81a1317e53 1.2.1-SNAPSHOT 2018-08-01 00:16:15 -04:00
eugene yokota 7c2ea0f374
Merge pull request #4290 from eed3si9n/wip/1.2.0 
1.2.1-SNAPSHOT
 2018-07-31 10:41:53 -04:00
Eugene Yokota 305a8de319 1.2.1-SNAPSHOT 2018-07-30 20:28:42 -04:00
Eugene Yokota 4bcfaee264 1.2.0 2018-07-30 00:56:36 -04:00
eugene yokota 02cea368eb
Merge pull request #4288 from eed3si9n/wip/bump 
Zinc, LM, Util 1.2.0
 2018-07-30 00:26:50 -04:00
Eugene Yokota 3d5b198f88 Zinc, LM, Util 1.2.0 2018-07-29 22:45:46 -04:00
eugene yokota 7e9e4879aa
Merge pull request #170 from eed3si9n/wip/bump 
IO 1.2.0
 2018-07-29 16:11:12 -04:00
Eugene Yokota 184c5bdaef IO 1.2.0 2018-07-29 15:36:27 -04:00
eugene yokota ad346f529a
Merge pull request #4278 from jozic/human-readable-total 
add human readable total time
 2018-07-29 13:56:27 -04:00
eugene yokota 404ea508e0
Merge pull request #169 from Dwolla/issue-168 
Output Caching: invoke output value function again, after executing output effect
 2018-07-27 13:53:10 -04:00
Brian P. Holt 6f2b78b6a8 clean up compiler warnings in util-tracking 2018-07-27 11:35:26 -05:00
Brian P. Holt 141d9357cc invoke output value function again, after executing output effect 
fixes #168
 2018-07-27 11:31:58 -05:00
Eugene Platonov cc2159d565 add human readable total time 2018-07-21 15:56:48 -04:00
Johannes Rudolph cf7926d4f5
Automatic reformattig 
Somehow this one was missed to be published before.
 2018-07-17 12:13:58 +02:00