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

6557 Commits

Author SHA1 Message Date
Eugene Yokota f4ae038023 Fix single repo emulation script 
Fixes #4330
Ref 5b179a2611 (diff-fdc3abdfd754eeb24090dbd90aeec2ce)
 2018-08-24 06:25:40 -04:00
Nepomuk Seiler 3a7d602b04 FIX #1972 add notes 2018-08-22 18:11:20 +02:00
Nepomuk Seiler 5989d07249 FIX #1972 fix lost package mappings with identical source file 2018-08-22 18:05:49 +02:00
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 42a4ae33f5 Merge branch 'wip/bumpvscodemodules' into wip/merge-1.2.x 2018-08-16 16:26:26 -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
Arnout Engelen b1fc7dc183 Support discovering JDK 11 in JAVA_HOME for CrossJava 2018-08-09 14:43:11 +02: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
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 ad346f529a
Merge pull request #4278 from jozic/human-readable-total 
add human readable total time
 2018-07-29 13:56:27 -04:00
Eugene Platonov cc2159d565 add human readable total time 2018-07-21 15:56:48 -04:00
eugene yokota 43607b0c40
Merge pull request #4270 from eed3si9n/wip/parser 
Fix bimcompat breakages in complete
 2018-07-15 23:26:52 -04:00
eugene yokota 7dfc86d7a4
Merge pull request #4269 from eed3si9n/wip/switch 
Make ++ fail when it doesn't affect any subprojects
 2018-07-15 22:33:56 -04:00
Eugene Yokota 4ecb3a3f7c Fix bimcompat breakages in complete 
Fixes https://github.com/sbt/sbt/issues/4268
 2018-07-15 22:28:55 -04:00
Eugene Yokota 1bf6f0d2a0 Make ++ fail when it doesn't affect any subprojects 
Fixes #4267
 2018-07-15 20:47:59 -04:00
eugene yokota 2d106d92a5
Merge pull request #4265 from eed3si9n/wip/bumpzinc 
Zinc 1.2.0-M2
 2018-07-14 09:06:09 -04:00
Eugene Yokota 29fa4fb20c Zinc 1.2.0-M2 2018-07-14 03:17:52 -04:00
eugene yokota c02bc2f9d1
Merge pull request #4264 from eed3si9n/wip/javacrossfix 
Fixes contains bug
 2018-07-14 03:13:05 -04:00
eugene yokota c3cbc7d475
Merge pull request #4263 from eed3si9n/wip/bumpg8 
sbt-giter8-resolver 0.11.0
 2018-07-14 01:18:03 -04:00
Eugene Yokota 439e67c8c4 Fixes contains bug 
Ref https://github.com/scala/bug/issues/10831
Ref https://github.com/sbt/sbt/pull/4139#commitcomment-29633458
 2018-07-14 01:05:14 -04:00
Eugene Yokota 5c2c8b262a sbt-giter8-resolver 0.11.0 2018-07-13 17:53:37 -04:00
eugene yokota 18602c521d
Merge pull request #4258 from eed3si9n/wip/scripted 
scripted-sbt-redux
 2018-07-10 10:03:26 -04:00
Eugene Yokota b3342118f8 Add dependencyOverrides for scripted-plugin 
Fixes #4249

This introduces an override rule into the metabuild so scripted-plugin will align with the sbt version.
 2018-07-10 03:13:47 -04:00
Eugene Yokota d7dc4b3e29 create scripted-sbt-redux 
Fixes #4241
Fixes #4242

This introduces a new subproject named scripted-sbt-redux. The purpose of this new subproject is to workaround the 'sbt.test` package vs `Keys.test` key confusion (#4242) while maintaining the forward compatibility of 0.13.17's sbt cross testing ^^ (#4241).

The new subproject uses `sbt.scriptedtest` package name, and that's the one that will be used by the mothership.

Meanwhile "scripted-sbt" subproject will also be published for compatibility purpose.
 2018-07-10 03:13:47 -04:00
eugene yokota 83934ec231
Merge pull request #4257 from xuwei-k/remove-old-scala 
simplify build settings. sbt 1.x no longer support old scala versions
 2018-07-10 03:05:45 -04:00
xuwei-k f01ff3dd03 simplify build settings. sbt 1.x no longer support old scala versions 2018-07-10 11:51:14 +09:00
eugene yokota de299c0413
Merge pull request #4255 from xuwei-k/remove-project-SiteMap 
remove unused project/SiteMap.scala
 2018-07-09 15:24:20 -04:00