Merge branch 'master' into enrique-2-13-1-update

kiroco12 · kiroco12 · commit 00c749c53e0e · 2020-02-04T13:35:07.000+01:00
# Conflicts:
#	server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala
#	server/src/main/scala/org/scalaexercises/evaluator/services.scala
diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
@@ -26,7 +26,7 @@ object ProjectPlugin extends AutoPlugin {
       lazy val scalatest   = "3.1.0"
       lazy val slf4jSimple = "1.7.30"
       lazy val jwtCore     = "4.2.0"
-      lazy val coursier    = "2.0.0-RC5-4"
+      lazy val coursier    = "2.0.0-RC5-6"
       lazy val config      = "1.4.0"
     }
 
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.5
+sbt.version=1.3.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 resolvers += Resolver.sonatypeRepo("snapshots")
-addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % "1.5.2")
+addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % "1.6.0")
 addSbtPlugin("com.eed3si9n"      % "sbt-assembly"        % "0.14.10")
 addSbtPlugin("com.eed3si9n"      % "sbt-buildinfo"       % "0.9.0")
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker"          % "1.5.0")

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ object ProjectPlugin extends AutoPlugin {`
`26`	`26`	`lazy val scalatest = "3.1.0"`
`27`	`27`	`lazy val slf4jSimple = "1.7.30"`
`28`	`28`	`lazy val jwtCore = "4.2.0"`
`29`		`- lazy val coursier = "2.0.0-RC5-4"`
	`29`	`+ lazy val coursier = "2.0.0-RC5-6"`
`30`	`30`	`lazy val config = "1.4.0"`
`31`	`31`	`}`
`32`	`32`