luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6168 from eatkins/ipcsocket-upgrade 

Update ipcsocket
This commit is contained in:
eugene yokota 2020-11-25 11:49:15 -05:00 committed by GitHub
parent 1051690d61 d5ddf0f8ce
commit d46d5dfff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main-command/src/main/scala/sbt/internal/server/Server.scala
View File

@ -71,7 +71,8 @@ private[sbt] object Server {
)
)
case ConnectionType.Local =>
val maxSocketLength = new UnixDomainSocketLibrary.SockaddrUn().sunPath.length - 1
val maxSocketLength =
UnixDomainSocketLibraryProvider.maxSocketLength(connection.useJni) - 1
val path = socketfile.getAbsolutePath
if (path.length > maxSocketLength)
sys.error(

2
project/Dependencies.scala
View File

@ -26,7 +26,7 @@ object Dependencies {
val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion
val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion
val testInterface = "org.scala-sbt" % "test-interface" % "1.0"
val ipcSocket = "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.1.0"
val ipcSocket = "org.scala-sbt.ipcsocket" % "ipcsocket" % "1.3.0"
private val compilerInterface = "org.scala-sbt" % "compiler-interface" % zincVersion
private val compilerClasspath = "org.scala-sbt" %% "zinc-classpath" % zincVersion