Skip to content

Commit

Permalink
Update Scala to 2.13.7 (#3214)
Browse files Browse the repository at this point in the history
  • Loading branch information
4e6 authored Dec 31, 2021
1 parent 33f1c4b commit ca0a6f0
Show file tree
Hide file tree
Showing 807 changed files with 4,626 additions and 3,050 deletions.
2 changes: 2 additions & 0 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
any libraries ([#1981](https://github.com/enso-org/enso/pull/1981)).
Additionally, made the `library/preinstall` endpoint able to install any
transitive dependencies of the library.
- Updated the Scala compiler and dependencies
([#3214](https://github.com/enso-org/enso/pull/3214)).

## Enso 0.2.31 (2021-10-01)

Expand Down
78 changes: 39 additions & 39 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import java.io.File
// === Global Configuration ===================================================
// ============================================================================

val scalacVersion = "2.13.6"
val scalacVersion = "2.13.7"
val graalVersion = "21.1.0"
val javaVersion = "11"
val ensoVersion = "0.2.32-SNAPSHOT" // Note [Engine And Launcher Version]
Expand Down Expand Up @@ -284,10 +284,10 @@ lazy val enso = (project in file("."))
def akkaPkg(name: String) = akkaURL %% s"akka-$name" % akkaVersion
def akkaHTTPPkg(name: String) = akkaURL %% s"akka-$name" % akkaHTTPVersion
val akkaURL = "com.typesafe.akka"
val akkaVersion = "2.6.6"
val akkaHTTPVersion = "10.2.0-RC1"
val akkaVersion = "2.6.18"
val akkaHTTPVersion = "10.2.7"
val akkaMockSchedulerVersion = "0.5.5"
val logbackClassicVersion = "1.2.3"
val logbackClassicVersion = "1.2.10"
val akkaActor = akkaPkg("actor")
val akkaStream = akkaPkg("stream")
val akkaTyped = akkaPkg("actor-typed")
Expand All @@ -310,8 +310,8 @@ val akka =

// === Cats ===================================================================

val catsVersion = "2.2.0-M3"
val kittensVersion = "2.1.0"
val catsVersion = "2.7.0"
val kittensVersion = "2.3.2"
val cats = {
Seq(
"org.typelevel" %% "cats-core" % catsVersion,
Expand All @@ -324,22 +324,22 @@ val cats = {

// === Circe ==================================================================

val circeVersion = "0.14.0-M1"
val circeYamlVersion = "0.13.1"
val enumeratumCirceVersion = "1.6.1"
val circeGenericExtrasVersion = "0.13.0"
val circeVersion = "0.14.1"
val circeYamlVersion = "0.14.1"
val enumeratumCirceVersion = "1.7.0"
val circeGenericExtrasVersion = "0.14.1"
val circe = Seq("circe-core", "circe-generic", "circe-parser")
.map("io.circe" %% _ % circeVersion)

// === Commons ================================================================

val commonsCollectionsVersion = "4.4"
val commonsLangVersion = "3.10"
val commonsIoVersion = "2.7"
val commonsLangVersion = "3.12.0"
val commonsIoVersion = "2.11.0"
val commonsTextVersion = "1.8"
val commonsMathVersion = "3.6.1"
val commonsCompressVersion = "1.20"
val commonsCliVersion = "1.4"
val commonsCompressVersion = "1.21"
val commonsCliVersion = "1.5.0"
val commons = Seq(
"org.apache.commons" % "commons-collections4" % commonsCollectionsVersion,
"org.apache.commons" % "commons-lang3" % commonsLangVersion,
Expand All @@ -351,7 +351,7 @@ val commons = Seq(

// === Jackson ================================================================

val jacksonVersion = "2.11.1"
val jacksonVersion = "2.13.1"
val jackson = Seq(
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % jacksonVersion,
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,
Expand All @@ -360,23 +360,23 @@ val jackson = Seq(

// === JAXB ================================================================

val jaxbVersion = "2.3.3"
val jaxbVersion = "3.0.1"
val jaxb = Seq(
"jakarta.xml.bind" % "jakarta.xml.bind-api" % jaxbVersion % Benchmark,
"com.sun.xml.bind" % "jaxb-impl" % jaxbVersion % Benchmark
)

// === JMH ====================================================================

val jmhVersion = "1.23"
val jmhVersion = "1.34"
val jmh = Seq(
"org.openjdk.jmh" % "jmh-core" % jmhVersion % Benchmark,
"org.openjdk.jmh" % "jmh-generator-annprocess" % jmhVersion % Benchmark
)

// === Monocle ================================================================

val monocleVersion = "2.0.5"
val monocleVersion = "2.1.0"
val monocle = {
Seq(
"com.github.julien-truffaut" %% "monocle-core" % monocleVersion,
Expand All @@ -398,39 +398,39 @@ val icuVersion = "67.1"

// === ZIO ====================================================================

val zioVersion = "1.0.1"
val zioInteropCatsVersion = "2.1.4.0"
val zioVersion = "1.0.12"
val zioInteropCatsVersion = "3.2.9.0"
val zio = Seq(
"dev.zio" %% "zio" % zioVersion,
"dev.zio" %% "zio-interop-cats" % zioInteropCatsVersion
)

// === Other ==================================================================

val bcpkixJdk15Version = "1.65"
val bcpkixJdk15Version = "1.70"
val bumpVersion = "0.1.3"
val declineVersion = "1.2.0"
val declineVersion = "2.2.0"
val directoryWatcherVersion = "0.9.10"
val flatbuffersVersion = "1.12.0"
val guavaVersion = "29.0-jre"
val jlineVersion = "3.19.0"
val kindProjectorVersion = "0.13.0"
val mockitoScalaVersion = "1.14.8"
val guavaVersion = "31.0.1-jre"
val jlineVersion = "3.21.0"
val kindProjectorVersion = "0.13.2"
val mockitoScalaVersion = "1.16.49"
val newtypeVersion = "0.4.4"
val pprintVersion = "0.5.9"
val pureconfigVersion = "0.15.0"
val refinedVersion = "0.9.14"
val scalacheckVersion = "1.14.3"
val scalacticVersion = "3.3.0-SNAP2"
val scalaLoggingVersion = "3.9.2"
val pprintVersion = "0.7.1"
val pureconfigVersion = "0.17.1"
val refinedVersion = "0.9.27"
val scalacheckVersion = "1.15.4"
val scalacticVersion = "3.3.0-SNAP3"
val scalaLoggingVersion = "3.9.4"
val scalameterVersion = "0.19"
val scalatagsVersion = "0.9.1"
val scalatestVersion = "3.3.0-SNAP2"
val scalatagsVersion = "0.11.0"
val scalatestVersion = "3.3.0-SNAP3"
val shapelessVersion = "2.4.0-M1"
val slf4jVersion = "1.7.30"
val slickVersion = "3.3.2"
val sqliteVersion = "3.36.0.1"
val tikaVersion = "1.24.1"
val slf4jVersion = "1.7.32"
val slickVersion = "3.3.3"
val sqliteVersion = "3.36.0.3"
val tikaVersion = "2.2.1"
val typesafeConfigVersion = "1.4.1"

// ============================================================================
Expand Down Expand Up @@ -932,7 +932,7 @@ lazy val searcher = project
lazy val `interpreter-dsl` = (project in file("lib/scala/interpreter-dsl"))
.settings(
version := "0.1",
libraryDependencies += "com.google.auto.service" % "auto-service" % "1.0-rc7" exclude ("com.google.code.findbugs", "jsr305")
libraryDependencies += "com.google.auto.service" % "auto-service" % "1.0.1" exclude ("com.google.code.findbugs", "jsr305")
)

// ============================================================================
Expand Down
Loading

0 comments on commit ca0a6f0

Please sign in to comment.