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 6f1e6c36d9 cross JVM testing 
This continues to use Oracle JDK 8 for building, but adds test jobs using oraclejdk8, oraclejdk9, and oraclejdk10.
 2018-02-15 00:42:01 -05:00
Dale Wijnand 78f7658a67
Merge pull request #3945 from dwijnand/merge-1.1.x-into-1.x 
Merge 1.1.x into 1.x
 2018-02-14 16:51:31 +00:00
Dale Wijnand 20367938b1
version := "1.2.0-SNAPSHOT" 2018-02-14 14:38:25 +00:00
Dale Wijnand 76e2f550ec
Merge branch '1.1.x' into merge-1.1.x-into-1.x 
* 1.1.x:
  Update mimaPreviousArtifacts/sbt.version
  Introduce SBT_GLOBAL_SERVER_DIR env var to override too long paths
  Handle very long socket file paths on UNIX

Conflicts:
	project/build.properties
 2018-02-14 14:38:07 +00:00
Dale Wijnand 7dcb311301
Merge pull request #3944 from dwijnand/versions 
Update mimaPreviousArtifacts/sbt.version
 2018-02-14 14:37:06 +00:00
Dale Wijnand 592dee0211
Merge pull request #208 from dwijnand/merge-1.1.x-into-1.x 
Merge 1.1.x into 1.x
 2018-02-14 14:36:53 +00:00
Dale Wijnand 9891f07bda
Merge pull request #150 from dwijnand/merge-1.1.x-into-1.x 
Merge 1.1.x into 1.x
 2018-02-14 14:23:59 +00:00
Dale Wijnand b50cc6f342
Merge pull request #215 from 2m/wip-no-decimals-2m 
Use only integers for versions
 2018-02-14 14:21:06 +00:00
Martynas Mickevičius 5a0bde442d
Use only integers for versions 2018-02-14 14:00:36 +02:00
Dale Wijnand fce6d46bf3
Merge branch '1.1.x' into merge-1.1.x-into-1.x 
* 1.1.x:
  Update version/mimaPreviousArtifacts/sbt.version
  clarify intent
  avoid deadlocks on spotty connections, fix https://github.com/sbt/sbt/issues/3738
  Add version 1.1.2 to mimaPreviousArtifacts
 2018-02-14 11:02:29 +00:00
Dale Wijnand 130ec14c99
Merge branch '1.1.x' into merge-1.1.x-into-1.x 
* 1.1.x:
  Update version/sbt.version
  Add version 1.1.2 to mimaPreviousArtifacts

 Conflicts:
	project/build.properties
 2018-02-14 11:01:16 +00:00
Dale Wijnand 69fb352fa1
Merge pull request #207 from dwijnand/versions 
Update version/mimaPreviousArtifacts/sbt.version
 2018-02-14 10:54:12 +00:00
Dale Wijnand 9f12566a51
Merge pull request #149 from dwijnand/versions 
Update version/sbt.version
 2018-02-14 10:54:06 +00:00
Dale Wijnand e8d1a30474
Update mimaPreviousArtifacts/sbt.version 2018-02-14 10:53:37 +00:00
Dale Wijnand bfe347cd22
Update version/mimaPreviousArtifacts/sbt.version 2018-02-14 10:46:24 +00:00
Dale Wijnand f593fc6c74
Update version/sbt.version 2018-02-14 10:44:16 +00:00
TATSUNO Yasuhiro 06420a7c62 Ignore comment in .jvmopts on Windows (#213) 2018-02-14 09:06:22 +00:00
Alexandre Archambault 7b12da18b6
Add note about merging PRs in DEVELOPMENT.md (#776) 2018-02-13 14:56:25 +01:00
Dale Wijnand aa574a8f8c
Merge pull request #211 from eatkins/gc-output 
Whitelist java9-rt-ext- output in rt export process
 2018-02-13 13:02:16 +00:00
Dale Wijnand 09cf5cb7e5
Merge pull request #210 from 2m/wip-unfreeze-jdk9-package-2m 
Unfreeze jdk9 appveyor package version
 2018-02-13 12:45:06 +00:00
Martynas Mickevičius 769b3a46a2
Use not-yet-approved package version 2018-02-13 14:30:34 +02:00
Dale Wijnand 8546fc7ea6
Merge pull request #3932 from dwijnand/max-socket-length 
Handle very long socket file paths on UNIX
 2018-02-13 07:36:15 +00:00
eugene yokota 50b1555d94
Merge pull request #3940 from xuwei-k/readme-version 
update README. s/1.0.x/1.x/
 2018-02-12 21:20:16 -05:00
xuwei-k f56d5b2d90 update README. s/1.0.x/1.x/ 2018-02-13 10:00:50 +09:00
Nick Howard 137973c06c Update Pants development instructions for Scala 2.12 (#777) 
The Pants build targets have moved to 2.12. This updates the instructions to account for that.
 2018-02-12 17:00:38 -08:00
Dale Wijnand 4e038c91ce
Introduce SBT_GLOBAL_SERVER_DIR env var to override too long paths 2018-02-12 17:57:26 +00:00
Ethan Atkins 09a7152b1d Whitelist java9-rt-ext- output in rt export process 
If -verbose:gc is set, there can be gc log output in this process that
prevents the directory from being properly extracted. Rather than
blacklist possible output strings, I think it makes more sense to
whitelist the specific output line that we're looking for.
 2018-02-12 09:20:30 -08:00
Leonard Ehrenfried df58a68a39 Remove more sbt._ types from sbt-shared (#775) 
* Remove more sbt._ types from sbt-shared

* Replace sbt.url

* Upgrade to sbt-compat 1.2.6
 2018-02-12 13:46:44 +01:00
Dale Wijnand ccd399e71a
Merge pull request #3937 from eed3si9n/wip/1.1.1 
Merge branch 1.1.x into 1.x
 2018-02-10 11:48:17 +00:00
Eugene Yokota 3db0e09b33 Merge branch '1.1.x' into wip/1.1.1 
# Conflicts:
#	main/src/main/scala/sbt/internal/CommandExchange.scala
#	main/src/main/scala/sbt/internal/ConsoleProject.scala
#	notes/1.0.2/sample.md
#	notes/1.1.1/sample.md
#	notes/sample.md
#	sbt/src/test/scala/sbt/ServerSpec.scala
 2018-02-09 23:55:23 -05:00
eugene yokota 2c0b953321
Merge pull request #3936 from eed3si9n/wip/notes 
sbt 1.1.1 notes
 2018-02-09 23:36:05 -05:00
Eugene Yokota 15018c1971 notes 2018-02-09 23:33:08 -05:00
Alexandre Archambault 4177b0adc7
Merge pull request #772 from leonardehrenfried/sbt-1.1.1 
Upgrade to sbt 1.1.1
 2018-02-09 16:25:47 +01:00
Leonard Ehrenfried be486c01be Upgrade to sbt 1.1.1 2018-02-09 14:14:59 +01:00
Leonard Ehrenfried c30421e145 Upgrade to sbt 1.1.0, update sbt-pack 2018-02-09 14:14:58 +01:00
Dale Wijnand b0baf7de6d
Merge pull request #146 from dwijnand/SourcePosition 
Give SourcePosition a macro instance creator
 2018-02-09 12:38:47 +00:00
Dale Wijnand 638dbeb84c
Merge pull request #3933 from dwijnand/ServerSpec-Codacy2 
Fix another Codacy issue in ServerSpec
 2018-02-09 12:38:27 +00:00
Dale Wijnand 4c765e0e93
Merge pull request #3927 from sbt/sbt-boot-lock-sysprop 
Adds sbt.boot.lock sysprop to opt-out
 2018-02-09 12:37:54 +00:00
Alexandre Archambault 2cb42444cd Go back to 1.0.1 launcher 
The 1.0.2 one seems broken :/ (issue with proguarding and scala 2.12?)
 2018-02-09 13:22:18 +01:00
Alexandre Archambault 6c3cf920fa Setting version to 1.0.3-SNAPSHOT 2018-02-09 11:26:42 +01:00
Alexandre Archambault 37aff72ada
Updates for 1.0.2 2018-02-09 11:26:37 +01:00
Alexandre Archambault f743b85d1d Setting version to 1.0.2 2018-02-09 11:01:17 +01:00
Leonard Ehrenfried 4519faaf10 Remove sbt._ types from FromSbt.scala (#771) 
* Remove more types from sbt._ namespace

* Use newest version of sbt-compat
 2018-02-09 00:57:08 +01:00
Eugene Yokota 39d9927179 1.1.2-SNAPSHOT 2018-02-08 13:08:32 -05:00
Eugene Yokota 4da6a8952b 1.1.1 launchconfig 2018-02-08 13:08:21 -05:00
Dale Wijnand 74ff6aa1ce
Fix another Codacy issue in ServerSpec 2018-02-08 14:16:54 +00:00
Dale Wijnand ada2a8aafa
Give SourcePosition a macro instance creator 2018-02-08 13:11:34 +00:00
Dale Wijnand 402378a81e
Adds sbt.boot.lock sysprop to opt-out 
Adds sbt.boot.lock as a system property to opt-out of locking.

This might be useful when running on filesystems on which the locking code path would throw an exception.

Upstream issue: https://bugs.openjdk.java.net/browse/JDK-8193594
Provides a workaround for #2222, thus...
Closes #2222.
 2018-02-08 13:02:39 +00:00
Dale Wijnand 8e7dfb4b20
Handle very long socket file paths on UNIX 
Fixes #3930
 2018-02-08 13:00:46 +00:00
Dale Wijnand d75d95d653
Merge pull request #3931 from eed3si9n/wip/bump 
Zinc 1.1.1, LM 1.1.3, IO 1.1.4
 2018-02-08 07:31:35 +00:00