Skip to content

Updates build #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juanpedromoreno merged 2 commits into from
Jun 29, 2020
Merged

Updates build #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4000f
Updates build
juanpedromoreno Jun 29, 2020
61b936e
Updates exercises version
juanpedromoreno Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project/ProjectPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object ProjectPlugin extends AutoPlugin {
object V {
lazy val cats = "2.1.1"
lazy val catsEffect = "2.1.3"
lazy val http4s = "0.21.5"
lazy val http4s = "0.21.6"
lazy val circe = "0.13.0"
lazy val log4s = "1.7.0"
lazy val scalatest = "3.2.0"
Expand All @@ -27,7 +27,7 @@ object ProjectPlugin extends AutoPlugin {
lazy val jwtCore = "4.3.0"
lazy val coursier = "2.0.0-RC6-21"
lazy val config = "1.4.0"
lazy val scala = "2.13.2"
lazy val scala = "2.13.3"
}

lazy val dockerSettings = Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.12
sbt.version=1.3.13
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.3")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
Expand Down
6 changes: 3 additions & 3 deletions server/src/test/scala/org/scalaexercises/evaluator/helper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package org.scalaexercises.evaluator
object helper {

val remotes: List[String] = "https://oss.sonatype.org/content/repositories/releases/" :: Nil
val exercisesVersion: String = "0.6.0-SNAPSHOT"
val exercisesVersion: String = "0.6.2"

sealed abstract class ScalaVersion(val version: String)

case object Scala213 extends ScalaVersion("2.13.1")
case object Scala213 extends ScalaVersion("2.13.3")

def toScalaVersion(v: String): ScalaVersion =
v match {
Expand All @@ -48,7 +48,7 @@ object helper {
def circeLibraryDependencies(scala: ScalaVersion): List[Dependency] = {
val sv = scala.version

val circeVersion = "0.12.3"
val circeVersion = "0.13.0"
List(
Dependency("io.circe", s"circe-core_${sv.substring(0, 4)}", circeVersion),
Dependency("io.circe", s"circe-generic_${sv.substring(0, 4)}", circeVersion),
Expand Down