Merge branch 'master' into update/sbt-1.3.5

ThoughtWorksInc · Dec 24, 2019 · 3d9ad62 · 3d9ad62
2 parents b601e50 + ade75d4
commit 3d9ad62
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 target/
 local.sbt
 secret/
+.metals/
+.bloop/
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -0,0 +1,5 @@
+image: igeolise/scalajs-test-runner:latest
+vscode:
+  extensions:
+    - [email protected]:wQBBM+lKILHBqOqlqW60xA==
+    - [email protected]:pVVu91DEAijx+sPKu8fgHA==
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,2 +1,2 @@
-version = "1.5.1"
-maxColumn = 120
+version = "2.2.2"
+maxColumn = 120
diff --git a/build.sbt b/build.sbt
@@ -31,7 +31,7 @@ dependsOn(
   `skip-duplicate-java-publish`
 )
 
-libraryDependencies += "com.lihaoyi" %% "sourcecode" % "0.1.8"
+libraryDependencies += "com.lihaoyi" %% "sourcecode" % "0.1.9"
 
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0")
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.5
+sbt.version=1.3.5