Skip to content

Commit

Permalink
Merge pull request #146 from eed3si9n/wip/bump
Browse files Browse the repository at this point in the history
Scala 2.12.6 and other dependencies
  • Loading branch information
dwijnand authored Apr 30, 2018
2 parents 1bbf099 + 213f4e3 commit d8a23ca
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,8 @@ val io = (project in file("io"))
// moved JavaMilli to sbt.io
exclude[MissingClassProblem]("sbt.internal.io.JavaMilli$"),
exclude[MissingClassProblem]("sbt.internal.io.JavaMilli"),

// protected[this]
exclude[DirectMissingMethodProblem]("sbt.io.CopyOptions.copy*"),
),
)
4 changes: 2 additions & 2 deletions io/src/main/contraband-scala/sbt/io/CopyOptions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class CopyOptions private (
override def toString: String = {
"CopyOptions(" + overwrite + ", " + preserveLastModified + ", " + preserveExecutable + ")"
}
protected[this] def copy(overwrite: Boolean = overwrite, preserveLastModified: Boolean = preserveLastModified, preserveExecutable: Boolean = preserveExecutable): CopyOptions = {
private[this] def copy(overwrite: Boolean = overwrite, preserveLastModified: Boolean = preserveLastModified, preserveExecutable: Boolean = preserveExecutable): CopyOptions = {
new CopyOptions(overwrite, preserveLastModified, preserveExecutable)
}
def withOverwrite(overwrite: Boolean): CopyOptions = {
Expand All @@ -45,6 +45,6 @@ final class CopyOptions private (
}
object CopyOptions {

def apply(): CopyOptions = new CopyOptions(false, false, true)
def apply(): CopyOptions = new CopyOptions()
def apply(overwrite: Boolean, preserveLastModified: Boolean, preserveExecutable: Boolean): CopyOptions = new CopyOptions(overwrite, preserveLastModified, preserveExecutable)
}
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import Keys._
object Dependencies {
val scala210 = "2.10.7"
val scala211 = "2.11.12"
val scala212 = "2.12.4"
val scala212 = "2.12.6"
val scala213 = "2.13.0-M3"

val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }

val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4"
val scalatest = "org.scalatest" %% "scalatest" % "3.0.3"
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
val jna = "net.java.dev.jna" % "jna" % "4.5.0"
val jnaPlatform = "net.java.dev.jna" % "jna-platform" % "4.5.0"
val appleFileEvents = "com.swoval" % "apple-file-events" % "1.3.2"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.2
sbt.version=1.1.4
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.6")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.0")

0 comments on commit d8a23ca

Please sign in to comment.