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

bump modules and plugins

This commit is contained in:
Eugene Yokota 2017-12-16 01:41:13 -05:00
parent ae99922101
commit 40b86ae412
9 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main-actions/src/main/scala/sbt/compiler/Eval.scala
View File

@ -487,8 +487,10 @@ private[sbt] object Eval {
def fileModifiedBytes(f: File): Array[Byte] = def fileModifiedBytes(f: File): Array[Byte] =
(if (f.isDirectory) filesModifiedBytes(f listFiles classDirFilter) (if (f.isDirectory) filesModifiedBytes(f listFiles classDirFilter)
else else
bytes(try IO.getModifiedTime(f) catch { case _: java.io.FileNotFoundException => 0L })) ++ bytes(
bytes(f.getAbsolutePath) try IO.getModifiedTime(f)
catch { case _: java.io.FileNotFoundException => 0L })) ++
bytes(f.getAbsolutePath)
def fileExistsBytes(f: File): Array[Byte] = def fileExistsBytes(f: File): Array[Byte] =
bytes(f.exists) ++ bytes(f.exists) ++
bytes(f.getAbsolutePath) bytes(f.getAbsolutePath)

8
project/Dependencies.scala
View File

@ -12,10 +12,10 @@ object Dependencies {
val baseScalaVersion = scala212 val baseScalaVersion = scala212
// sbt modules // sbt modules
private val ioVersion = "1.1.1" private val ioVersion = "1.1.2"
private val utilVersion = "1.1.0" private val utilVersion = "1.1.1"
private val lmVersion = "1.1.0" private val lmVersion = "1.1.1"
private val zincVersion = "1.1.0-RC1" private val zincVersion = "1.1.0-RC3"
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion private val sbtIO = "org.scala-sbt" %% "io" % ioVersion

11
project/plugins.sbt
View File

@ -1,15 +1,8 @@
scalaVersion := "2.12.3" scalaVersion := "2.12.3"
scalacOptions ++= Seq("-feature", "-language:postfixOps") scalacOptions ++= Seq("-feature", "-language:postfixOps")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.17") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.4")
// addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.0") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2")
// addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.2")
// addSbtPlugin("com.typesafe.sbt" % "sbt-javaversioncheck" % "0.1.0")
// addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.2.0")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.14") addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.14")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")

2
protocol/src/main/contraband-scala/sbt/internal/langserver/ClientCapabilities.scala
View File

@ -9,7 +9,7 @@ final class ClientCapabilities private () extends Serializable {
override def equals(o: Any): Boolean = o match { override def equals(o: Any): Boolean = o match {
case x: ClientCapabilities => true case _: ClientCapabilities => true
case _ => false case _ => false
} }
override def hashCode: Int = { override def hashCode: Int = {

2
protocol/src/main/contraband-scala/sbt/protocol/CommandMessage.scala
View File

@ -11,7 +11,7 @@ abstract class CommandMessage() extends Serializable {
override def equals(o: Any): Boolean = o match { override def equals(o: Any): Boolean = o match {
case x: CommandMessage => true case _: CommandMessage => true
case _ => false case _ => false
} }
override def hashCode: Int = { override def hashCode: Int = {

2
protocol/src/main/contraband-scala/sbt/protocol/EventMessage.scala
View File

@ -11,7 +11,7 @@ abstract class EventMessage() extends Serializable {
override def equals(o: Any): Boolean = o match { override def equals(o: Any): Boolean = o match {
case x: EventMessage => true case _: EventMessage => true
case _ => false case _ => false
} }
override def hashCode: Int = { override def hashCode: Int = {

2
protocol/src/main/contraband-scala/sbt/protocol/SettingQueryResponse.scala
View File

@ -10,7 +10,7 @@ abstract class SettingQueryResponse() extends sbt.protocol.EventMessage() with S
override def equals(o: Any): Boolean = o match { override def equals(o: Any): Boolean = o match {
case x: SettingQueryResponse => true case _: SettingQueryResponse => true
case _ => false case _ => false
} }
override def hashCode: Int = { override def hashCode: Int = {

2
testing/src/main/contraband-scala/sbt/protocol/testing/TestInitEvent.scala
View File

@ -10,7 +10,7 @@ final class TestInitEvent private () extends sbt.protocol.testing.TestMessage()
override def equals(o: Any): Boolean = o match { override def equals(o: Any): Boolean = o match {
case x: TestInitEvent => true case _: TestInitEvent => true
case _ => false case _ => false
} }
override def hashCode: Int = { override def hashCode: Int = {

2
testing/src/main/contraband-scala/sbt/protocol/testing/TestMessage.scala
View File

@ -11,7 +11,7 @@ abstract class TestMessage() extends Serializable {
override def equals(o: Any): Boolean = o match { override def equals(o: Any): Boolean = o match {
case x: TestMessage => true case _: TestMessage => true
case _ => false case _ => false
} }
override def hashCode: Int = { override def hashCode: Int = {