Merge branch 'master' into update/scalatest-3.0.8

tanishiking · Sep 19, 2019 · f3b6f58 · f3b6f58
2 parents 7f68cef + 29a80da
commit f3b6f58
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "2.0.0-RC5"
+version = "2.0.1"
 continuationIndent.callSite = 2
 continuationIndent.defnSite = 2
 maxColumn = 100

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: scala
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 stages:
   - name: test

diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
-val scalafmtV = "2.0.0-RC8"
-val metaconfigV = "0.9.3"
+val scalafmtV = "2.0.1"
+val metaconfigV = "0.9.4"
 val scalatestV = "3.0.8"
 val scoptV = "3.7.1"
 val similarityV = "1.2.1"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.2.6
+sbt.version = 1.3.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.2.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.5")
+addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.3.2")