Skip to content
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

Jump to bottom

Update Scala to 2.13.8 #3631

Merged
merged 15 commits into from
Aug 8, 2022
Merged

Update Scala to 2.13.8 #3631

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6bcf3d6
feat: scala 2.13.8
4e6 Aug 2, 2022
b360b60
misc: changelog
4e6 Aug 2, 2022
18cc9ed
fix: postgresql dep
4e6 Aug 2, 2022
6b2dc80
update: netbeans api
4e6 Aug 4, 2022
e97a002
update: circe-generic
4e6 Aug 4, 2022
a16b255
fix: launcher
4e6 Aug 4, 2022
41de19f
fix: legal review
4e6 Aug 4, 2022
1aa613b
Merge branch 'develop' into wip/db/scala-2.13.8
mergify[bot] Aug 4, 2022
10dd0e0
misc: downgrade directory watcher
4e6 Aug 5, 2022
97c49a8
Merge branch 'develop' into wip/db/scala-2.13.8
mergify[bot] Aug 5, 2022
4505f66
Merge branch 'develop' into wip/db/scala-2.13.8
mergify[bot] Aug 5, 2022
43d0750
Merge branch 'develop' into wip/db/scala-2.13.8
mergify[bot] Aug 5, 2022
ba28e93
Merge branch 'develop' into wip/db/scala-2.13.8
4e6 Aug 8, 2022
f443a21
update: plugins
4e6 Aug 8, 2022
ed54e65
fix: scalaJS
4e6 Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@
- [Explicit `self`][3569]
- [Added benchmarking tool for the language server][3578]
- [Support module imports using a qualified name][3608]
- [Update Scala compiler and libraries][3631]

[3227]: https://github.com/enso-org/enso/pull/3227
[3248]: https://github.com/enso-org/enso/pull/3248
Expand Down Expand Up @@ -338,6 +339,7 @@
[3538]: https://github.com/enso-org/enso/pull/3569
[3578]: https://github.com/enso-org/enso/pull/3578
[3608]: https://github.com/enso-org/enso/pull/3608
[3631]: https://github.com/enso-org/enso/pull/3631

# Enso 2.0.0-alpha.18 (2021-10-12)

Expand Down
89 changes: 44 additions & 45 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import java.io.File
// === Global Configuration ===================================================
// ============================================================================

val scalacVersion = "2.13.7"
val scalacVersion = "2.13.8"
val graalVersion = "21.3.0"
val javaVersion = "11"
val defaultDevEnsoVersion = "0.0.0-dev"
Expand Down Expand Up @@ -324,10 +324,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.18"
val akkaHTTPVersion = "10.2.7"
val akkaVersion = "2.6.19"
val akkaHTTPVersion = "10.2.9"
val akkaMockSchedulerVersion = "0.5.5"
val logbackClassicVersion = "1.2.10"
val logbackClassicVersion = "1.2.11"
val akkaActor = akkaPkg("actor")
val akkaStream = akkaPkg("stream")
val akkaTyped = akkaPkg("actor-typed")
Expand All @@ -350,7 +350,7 @@ val akka =

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

val catsVersion = "2.7.0"
val catsVersion = "2.8.0"
val kittensVersion = "2.3.2"
val cats = {
Seq(
Expand All @@ -364,10 +364,10 @@ val cats = {

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

val circeVersion = "0.14.1"
val circeVersion = "0.14.2"
val circeYamlVersion = "0.14.1"
val enumeratumCirceVersion = "1.7.0"
val circeGenericExtrasVersion = "0.14.1"
val circeGenericExtrasVersion = "0.14.2"
val circe = Seq("circe-core", "circe-generic", "circe-parser")
.map("io.circe" %% _ % circeVersion)

Expand All @@ -391,7 +391,7 @@ val commons = Seq(

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

val jacksonVersion = "2.13.1"
val jacksonVersion = "2.13.3"
val jackson = Seq(
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % jacksonVersion,
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,
Expand All @@ -400,15 +400,15 @@ val jackson = Seq(

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

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

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

val jmhVersion = "1.34"
val jmhVersion = "1.35"
val jmh = Seq(
"org.openjdk.jmh" % "jmh-core" % jmhVersion % Benchmark,
"org.openjdk.jmh" % "jmh-generator-annprocess" % jmhVersion % Benchmark
Expand All @@ -434,7 +434,7 @@ val scalaCompiler = Seq(

// === std-lib ================================================================

val icuVersion = "67.1"
val icuVersion = "71.1"

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

Expand All @@ -449,29 +449,30 @@ val zio = Seq(

val bcpkixJdk15Version = "1.70"
val bumpVersion = "0.1.3"
val declineVersion = "2.2.0"
val directoryWatcherVersion = "0.9.10"
val declineVersion = "2.3.0"
val directoryWatcherVersion = "0.16.1"
val flatbuffersVersion = "1.12.0"
val guavaVersion = "31.0.1-jre"
val guavaVersion = "31.1-jre"
val jlineVersion = "3.21.0"
val kindProjectorVersion = "0.13.2"
val mockitoScalaVersion = "1.16.49"
val mockitoScalaVersion = "1.17.7"
val newtypeVersion = "0.4.4"
val pprintVersion = "0.7.1"
val pprintVersion = "0.7.3"
val pureconfigVersion = "0.17.1"
val refinedVersion = "0.9.27"
val scalacheckVersion = "1.15.4"
val scalacheckVersion = "1.16.0"
val scalacticVersion = "3.3.0-SNAP3"
val scalaLoggingVersion = "3.9.4"
val scalameterVersion = "0.19"
val scalatagsVersion = "0.11.0"
val scalatagsVersion = "0.11.1"
val scalatestVersion = "3.3.0-SNAP3"
val shapelessVersion = "2.4.0-M1"
val slf4jVersion = "1.7.32"
val slf4jVersion = "1.7.36"
val slickVersion = "3.3.3"
val sqliteVersion = "3.36.0.3"
val tikaVersion = "2.2.1"
val typesafeConfigVersion = "1.4.1"
val tikaVersion = "2.4.1"
val typesafeConfigVersion = "1.4.2"
val junitVersion = "4.13.2"
val netbeansApiVersion = "RELEASE140"

// ============================================================================
// === Internal Libraries =====================================================
Expand All @@ -494,7 +495,7 @@ lazy val flexer = crossProject(JVMPlatform, JSPlatform)
.dependsOn(logger)
.settings(
version := "0.1",
resolvers += Resolver.sonatypeRepo("releases"),
resolvers ++= Resolver.sonatypeOssRepos("releases"),
libraryDependencies ++= scalaCompiler ++ Seq(
"com.google.guava" % "guava" % guavaVersion exclude ("com.google.code.findbugs", "jsr305"),
"org.typelevel" %%% "cats-core" % catsVersion,
Expand Down Expand Up @@ -659,9 +660,9 @@ lazy val graph = (project in file("lib/scala/graph/"))
.configs(Test)
.settings(
version := "0.1",
resolvers ++= Seq(
Resolver.sonatypeRepo("releases"),
Resolver.sonatypeRepo("snapshots")
resolvers ++= (
Resolver.sonatypeOssRepos("releases") ++
4e6 marked this conversation as resolved.
Show resolved Hide resolved
Resolver.sonatypeOssRepos("snapshots")
),
scalacOptions += "-Ymacro-annotations",
libraryDependencies ++= scalaCompiler ++ Seq(
Expand Down Expand Up @@ -707,15 +708,14 @@ lazy val `profiling-utils` = project
.settings(
version := "0.1",
libraryDependencies ++= Seq(
"org.netbeans.api" % "org-netbeans-modules-sampler" % "RELEASE130"
"org.netbeans.api" % "org-netbeans-modules-sampler" % netbeansApiVersion
exclude ("org.netbeans.api", "org-openide-loaders")
exclude ("org.netbeans.api", "org-openide-nodes")
// exclude following when RELEASE140 is out:
// exclude("org.netbeans.api", "org-netbeans-api-progress-nb")
// exclude("org.netbeans.api", "org-netbeans-api-progress")
// exclude("org.netbeans.api", "org-openide-util-lookup")
// exclude("org.netbeans.api", "org-openide-util")
// exclude("org.netbeans.api", "org-openide-dialogs")
exclude("org.netbeans.api", "org-netbeans-api-progress-nb")
exclude("org.netbeans.api", "org-netbeans-api-progress")
exclude("org.netbeans.api", "org-openide-util-lookup")
exclude("org.netbeans.api", "org-openide-util")
exclude("org.netbeans.api", "org-openide-dialogs")
exclude ("org.netbeans.api", "org-openide-filesystems")
exclude ("org.netbeans.api", "org-openide-util-ui")
exclude ("org.netbeans.api", "org-openide-awt")
Expand Down Expand Up @@ -983,7 +983,7 @@ lazy val `interpreter-dsl` = (project in file("lib/scala/interpreter-dsl"))
)),
libraryDependencies ++= Seq(
"org.apache.commons" % "commons-lang3" % commonsLangVersion,
"org.netbeans.api" % "org-openide-util-lookup" % "RELEASE130",
"org.netbeans.api" % "org-openide-util-lookup" % netbeansApiVersion,
"com.google.guava" % "guava" % guavaVersion exclude ("com.google.code.findbugs", "jsr305")
)
)
Expand Down Expand Up @@ -1249,8 +1249,7 @@ lazy val runtime = (project in file("engine/runtime"))
"org.scalatest" %% "scalatest" % scalatestVersion % Test,
"org.graalvm.truffle" % "truffle-api" % graalVersion % Benchmark,
"org.typelevel" %% "cats-core" % catsVersion,
"eu.timepit" %% "refined" % refinedVersion,
"junit" % "junit" % "4.12" % Test,
"junit" % "junit" % junitVersion % Test,
"com.novocode" % "junit-interface" % "0.11" % Test exclude ("junit", "junit-dep")
),
Compile / compile / compileInputs := (Compile / compile / compileInputs)
Expand Down Expand Up @@ -1757,9 +1756,9 @@ lazy val `std-table` = project
`table-polyglot-root` / "std-table.jar",
libraryDependencies ++= Seq(
"com.ibm.icu" % "icu4j" % icuVersion,
"com.univocity" % "univocity-parsers" % "2.9.0",
"org.apache.poi" % "poi-ooxml" % "5.0.0",
"org.apache.xmlbeans" % "xmlbeans" % "5.0.1",
"com.univocity" % "univocity-parsers" % "2.9.1",
"org.apache.poi" % "poi-ooxml" % "5.2.2",
"org.apache.xmlbeans" % "xmlbeans" % "5.1.0",
"org.graalvm.truffle" % "truffle-api" % graalVersion % "provided"
),
Compile / packageBin := Def.task {
Expand All @@ -1784,7 +1783,7 @@ lazy val `std-image` = project
Compile / packageBin / artifactPath :=
`image-polyglot-root` / "std-image.jar",
libraryDependencies ++= Seq(
"org.openpnp" % "opencv" % "4.5.1-0"
"org.openpnp" % "opencv" % "4.5.1-2"
),
Compile / packageBin := Def.task {
val result = (Compile / packageBin).value
Expand Down Expand Up @@ -1832,11 +1831,11 @@ lazy val `std-database` = project
`database-polyglot-root` / "std-database.jar",
libraryDependencies ++= Seq(
"org.xerial" % "sqlite-jdbc" % "3.36.0.3",
"org.postgresql" % "postgresql" % "42.3.6",
"com.amazon.redshift" % "redshift-jdbc42" % "2.1.0.1",
"com.amazonaws" % "aws-java-sdk-core" % "1.12.23",
"com.amazonaws" % "aws-java-sdk-redshift" % "1.12.23",
"com.amazonaws" % "aws-java-sdk-sts" % "1.12.23"
"org.postgresql" % "postgresql" % "42.4.0",
"com.amazon.redshift" % "redshift-jdbc42" % "2.1.0.9",
"com.amazonaws" % "aws-java-sdk-core" % "1.12.273",
"com.amazonaws" % "aws-java-sdk-redshift" % "1.12.273",
"com.amazonaws" % "aws-java-sdk-sts" % "1.12.273"
),
Compile / packageBin := Def.task {
val result = (Compile / packageBin).value
Expand Down
Loading