luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,940 Commits 22 Branches 333 Tags 97 MiB
Commit Graph

17940 Commits

Author SHA1 Message Date
eugene yokota eace6c0aed
Merge pull request #3828 from eed3si9n/wip/double_server 
warn about multiple instances once
 2017-12-20 15:38:40 -05:00
eugene yokota 16244f9be6
Merge pull request #3830 from dwijnand/catch-DeserializationException 
Replace Throwable catching with DeserializationException catching
 2017-12-20 10:22:21 -05:00
Eugene Yokota 06ffb4f440 warn about multiple instance once 
Fixes #3823

When you launch a second instance of sbt on a build, prior to this change it was displaying `java.io.IOException: sbt server is already running` on every command. This make it a bit less aggressive, and just display a warning once.

```
[warn] Is another instance of sbt is running on this build?
[warn] Running multiple instances is unsupported
```
 2017-12-20 10:09:03 -05:00
Dale Wijnand 6e09c660fe
Replace Throwable catching with DeserializationException catching 2017-12-20 11:50:02 +00:00
Eugene Yokota 4c3b770b27 bump to sbt 1.0.4 2017-12-19 20:57:09 -05:00
eugene yokota badb96efb4
Merge pull request #194 from dwijnand/houserules 
Upgrade to sbt-houserules 0.3.5
 2017-12-19 14:36:17 -05:00
eugene yokota 96c88a4291
Merge pull request #138 from dwijnand/houserules 
Upgrade to sbt-houserules 0.3.5
 2017-12-19 14:35:58 -05:00
eugene yokota 34d311f9ce
Merge pull request #3807 from dwijnand/remove-warnings 
Remove warnings
 2017-12-19 13:18:59 -05:00
Dale Wijnand 257712c052
Merge pull request #3824 from eed3si9n/wip/windows 
Add Windows testing
 2017-12-19 17:01:13 +00:00
Dale Wijnand eed3d21c86
Merge pull request #3825 from dwijnand/houserules 
Upgrade to sbt-houserules 0.3.5
 2017-12-19 16:51:21 +00:00
Dale Wijnand 4420a9bdd4
Merge pull request #3826 from dwijnand/disable-project/unique-settings-computation 
Disable project/unique-settings-computation
 2017-12-19 16:50:57 +00:00
Dale Wijnand 29c15e4e2e
Disable project/unique-settings-computation 
I've seen this fail Travis CI too many times.

Here's two examples:
* https://travis-ci.org/sbt/sbt/jobs/318632919
* https://travis-ci.org/sbt/sbt/jobs/313847550
 2017-12-19 15:19:12 +00:00
Dale Wijnand ad2d71cae4
Upgrade to sbt-houserules 0.3.5 2017-12-19 13:25:58 +00:00
Dale Wijnand abf370adc3
Upgrade to sbt-houserules 0.3.5 2017-12-19 13:23:44 +00:00
Dale Wijnand 28bcc6c602
Upgrade to sbt-houserules 0.3.5 2017-12-19 13:22:48 +00:00
Eugene Yokota bc4d3d5031 just scripted actions/* 2017-12-19 03:24:51 -05:00
Eugene Yokota 3507403a36 -Djna.nosys=true 2017-12-19 02:46:46 -05:00
Dale Wijnand cb6bae6c45
Merge pull request #202 from sbt/wip/windows2 
Remove double quotes around rtexport
 2017-12-19 07:20:45 +00:00
Eugene Yokota 294110e2b8 Remove JNA from sbt/sbt 
There's a conflict in JNA version difference between sbt and IO.

Fixes #3821
 2017-12-19 00:44:31 -05:00
Eugene Yokota c920919c2c Fix build so it works on Windows 2017-12-19 00:17:46 -05:00
Eugene Yokota ec5bdc2381 Add Windows testing 2017-12-18 23:24:20 -05:00
Eugene Yokota 0e59118ded Remove double quotes around rtexport 
See https://github.com/sbt/sbt/issues/3804#issuecomment-352602666
 2017-12-18 22:27:19 -05:00
eugene yokota 082643b761
Merge pull request #193 from dwijnand/mima 
Add 1.1.1 to mimaPreviousArtifacts, & backfill
 2017-12-18 21:37:37 -05:00
eugene yokota bff933aceb
Merge pull request #3815 from dwijnand/drop-0.14-references 
Drop 0.14.0 references
 2017-12-18 20:55:34 -05:00
eugene yokota de4af16434
Merge pull request #3818 from sbt/1.1.x 
Merge 1.1.x to 1.x
 2017-12-18 20:55:11 -05:00
eugene yokota b21d0e11fb
Merge pull request #3813 from dwijnand/add-project-id-to-watching-message 
Add project id to watching message
 2017-12-18 20:06:14 -05:00
eugene yokota 6b102af836
Merge pull request #137 from dwijnand/mima 
Add 1.1.1 to mimaPreviousArtifacts, & backfill
 2017-12-18 19:57:10 -05:00
Dale Wijnand 8fb23b4fe5
Add 1.1.1 to mimaPreviousArtifacts, & backfill 2017-12-18 16:25:32 +00:00
Dale Wijnand 2ee0a1e19a
Add 1.1.1 to mimaPreviousArtifacts, & backfill 2017-12-18 16:01:01 +00:00
Alexandre Archambault b21042a42a
Merge pull request #715 from coursier/topic/fix-build-1.0 
Update version numbers in CI scripts after 1.0.0 release
 2017-12-18 12:44:40 +01:00
Alexandre Archambault 1c134dc2a6 Update test fixtures if snapshot version changes 2017-12-18 12:00:10 +01:00
Alexandre Archambault 00fd13e786 Update version numbers in CI scripts after 1.0.0 release 2017-12-18 12:00:03 +01:00
eugene yokota db2c54d11d
Merge pull request #3817 from eed3si9n/wip/notes 
notes
 2017-12-16 19:17:07 -05:00
Eugene Yokota 87bb0f48a6 notes 2017-12-16 19:16:22 -05:00
eugene yokota e40ab026c0
Merge pull request #3816 from eed3si9n/wip/bump 
Convert lastModified() calls to the more precise getModifiedTime() + modules bump
 2017-12-16 13:19:02 -05:00
Eugene Yokota 40b86ae412 bump modules and plugins 2017-12-16 12:22:42 -05:00
Dale Wijnand ae99922101 Use IO.getModified over importing the method 2017-12-16 12:22:42 -05:00
Antonio Cunei 46d6b01f79 Use copyLastModified() in Sync.scala 
It turns out the code in Sync.scala activiely tries to transfer
the invalid modifed time of non-existent files in the source
directory over the time of the target file, which may or may
not exist. In case it exists, the modification time is set
to January 1, 1970. This is arguably a bug in Sync, which
should be adjusted to better handle mappings with source
files that do not exist. For now, however, we preserve the
current behavior, using the deprecated copyLastModified().
 2017-12-16 12:22:42 -05:00
Antonio Cunei 295bcff851 Hash calculation may throw exception w/ getModifiedTime(); fix 
In Eval there is a calculation of hashes by scanning the elements
of classpath, and getting the last modification time of each
directory. When lastModified() was in use, non-existent elements
would return 0L, but getModifiedTime() will throw an exception
instead (like getLastModifiedTime(), incidentally).
So, we catch the FileNotFoundException and return 0L now as well.
 2017-12-16 12:22:42 -05:00
Antonio Cunei 2129f8ceb5 Use IO.copyModifiedTime() in place of IO.copyLastModified() 2017-12-16 12:22:42 -05:00
Antonio Cunei 8c7b781d3f Moved Milli._ to IO. 2017-12-16 12:22:42 -05:00
Antonio Cunei 699b53262a Convert lastModified() to sbt.io.Milli.getModifiedTime(), more precise 2017-12-16 12:22:42 -05:00
eugene yokota bf94f3badf
Merge pull request #191 from eed3si9n/wip/bump 
Convert lastModified() calls to the more precise getModifiedTime()  + bump modules and plugins
 2017-12-15 14:28:29 -05:00
Eugene Yokota 68356306ec bump modules and plugins 2017-12-15 14:07:05 -05:00
Dale Wijnand 02c2ab5203 Use IO.getModified over importing the method 2017-12-15 14:06:16 -05:00
Antonio Cunei 41980634a4 Moved Milli._ to IO. 2017-12-15 14:06:16 -05:00
Antonio Cunei 340f1684c2 Temporary workaround to FileNotFoundException in RichUpdateReport() 2017-12-15 14:06:16 -05:00
Antonio Cunei ca2617e99e Convert lastModified/setLastModified calls to sbt.io.Milli calls (more precise) 2017-12-15 14:06:16 -05:00
eugene yokota 8b6ccd61db
Merge pull request #135 from eed3si9n/wip/1.1.1 
bump plugins
 2017-12-15 13:50:59 -05:00
Eugene Yokota e835ce0689 bump plugins 2017-12-15 13:15:34 -05:00