From 13b110faef7de9da5df7df8a422cf35d225d894a Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 19 Aug 2019 02:27:52 -0400 Subject: [PATCH 1/4] io 1.3.0-M16, util 1.3.0-M9, lm 1.3.0-M6, zinc 1.3.0-M9 --- project/Dependencies.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8537b07e1..b1209d0cd 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,14 +10,14 @@ object Dependencies { def nightlyVersion: Option[String] = sys.props.get("sbt.build.version") // sbt modules - private val ioVersion = nightlyVersion.getOrElse("1.3.0-M15") - private val utilVersion = nightlyVersion.getOrElse("1.3.0-M8") + private val ioVersion = nightlyVersion.getOrElse("1.3.0-M16") + private val utilVersion = nightlyVersion.getOrElse("1.3.0-M9") private val lmVersion = sys.props.get("sbt.build.lm.version") match { case Some(version) => version - case _ => nightlyVersion.getOrElse("1.3.0-M5") + case _ => nightlyVersion.getOrElse("1.3.0-M6") } - val zincVersion = nightlyVersion.getOrElse("1.3.0-M8") + val zincVersion = nightlyVersion.getOrElse("1.3.0-M9") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion From 6d54ad3745623a7c8a950c9f0f33838090ef0e55 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 19 Aug 2019 02:31:03 -0400 Subject: [PATCH 2/4] launcher 1.1.2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b1209d0cd..d042e8dae 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -32,7 +32,7 @@ object Dependencies { private val libraryManagementCore = "org.scala-sbt" %% "librarymanagement-core" % lmVersion private val libraryManagementIvy = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion - val launcherVersion = "1.1.1" + val launcherVersion = "1.1.2" val launcherInterface = "org.scala-sbt" % "launcher-interface" % launcherVersion val rawLauncher = "org.scala-sbt" % "launcher" % launcherVersion val testInterface = "org.scala-sbt" % "test-interface" % "1.0" From 01e7b5d191a17cca8d9ede138e4644a2cb95b014 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 19 Aug 2019 02:34:07 -0400 Subject: [PATCH 3/4] ScalaTest 3.0.8 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d042e8dae..3dffa0ba1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -120,7 +120,7 @@ object Dependencies { } val jline = "jline" % "jline" % "2.14.6" - val scalatest = "org.scalatest" %% "scalatest" % "3.0.6-SNAP5" + val scalatest = "org.scalatest" %% "scalatest" % "3.0.8" val scalacheck = "org.scalacheck" %% "scalacheck" % "1.14.0" val specs2 = "org.specs2" %% "specs2-junit" % "4.0.1" val junit = "junit" % "junit" % "4.11" From fcf7c5955e259141f56d694ffdb8b841f2eb81df Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 19 Aug 2019 03:37:33 -0400 Subject: [PATCH 4/4] remove neo-sbt-scalafmt test The test fails because the plugin is using reflection to access a private class, and we changed it - https://github.com/lucidsoftware/neo-sbt-scalafmt/issues/80 --- sbt/src/sbt-test/plugins/neo-sbt-scalafmt/build.sbt | 2 -- sbt/src/sbt-test/plugins/neo-sbt-scalafmt/project/extra.sbt | 1 - .../plugins/neo-sbt-scalafmt/src/main/scala/Main.scala | 6 ------ sbt/src/sbt-test/plugins/neo-sbt-scalafmt/test | 1 - 4 files changed, 10 deletions(-) delete mode 100644 sbt/src/sbt-test/plugins/neo-sbt-scalafmt/build.sbt delete mode 100644 sbt/src/sbt-test/plugins/neo-sbt-scalafmt/project/extra.sbt delete mode 100644 sbt/src/sbt-test/plugins/neo-sbt-scalafmt/src/main/scala/Main.scala delete mode 100644 sbt/src/sbt-test/plugins/neo-sbt-scalafmt/test diff --git a/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/build.sbt b/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/build.sbt deleted file mode 100644 index 6dcc058c2..000000000 --- a/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/build.sbt +++ /dev/null @@ -1,2 +0,0 @@ -scalaVersion := "2.12.2" -enablePlugins(ScalafmtPlugin) diff --git a/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/project/extra.sbt b/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/project/extra.sbt deleted file mode 100644 index 4aa3881f4..000000000 --- a/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/project/extra.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") diff --git a/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/src/main/scala/Main.scala b/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/src/main/scala/Main.scala deleted file mode 100644 index 61295349d..000000000 --- a/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/src/main/scala/Main.scala +++ /dev/null @@ -1,6 +0,0 @@ -import java.io.File -import java.nio.file.Files - -object Main extends App { - Files.write(new File("output").toPath, "OK".getBytes("UTF-8")) -} diff --git a/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/test b/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/test deleted file mode 100644 index 97b42a4f4..000000000 --- a/sbt/src/sbt-test/plugins/neo-sbt-scalafmt/test +++ /dev/null @@ -1 +0,0 @@ -> scalafmt