Skip to content

Prepare for Scala 2.13 #981

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

Draft
vnickolov wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Prepare for Scala 2.13 #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ subprojects {
'-feature',
'-Xfatal-warnings',
'-Xfuture',
'-Ypartial-unification',
// Not available in Scala 2.13
// '-Ypartial-unification',
'-Ywarn-adapted-args'
]

Expand Down
44 changes: 22 additions & 22 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cypher-frontend = "9.0.20190305"
cypher-tck = "1.0.0-M14"
discipline = "0.11.0"
eff = "7.0.6"
fastparse = "2.1.0"
fastparse = "3.1.1"
h2 = "2.4.240"
# Note: has shared transitive dependencies with spark
hadoop = "3.3.4"
Expand All @@ -19,21 +19,21 @@ mockito = "1.10.19"
neo4j-driver = "1.7.2"
netty = "4.2.7.Final"
# @pin - let's prevent automatic updates for the moment
scala-full = "2.12.20"
scala-full = "2.13.18"
# @pin - let's prevent automatic updates for the moment
scala-major = "2.12"
scala-major = "2.13"
scalacheck = "1.14.0"
scalatest = "3.0.6"
scalatest = "3.2.19"
spark = "3.5.7"
testcontainers = "2.0.2"
upickle = "4.4.1"

[libraries]
apache-commons-text = { module = "org.apache.commons:commons-text", version.ref = "apache-commons-text" }
bouncycastle = { module = "org.bouncycastle:bctls-jdk15on", version.ref = "bctls" }
exclusions-acyclic = { module = "com.lihaoyi:acyclic_2.12" }
exclusions-acyclic = { module = "com.lihaoyi:acyclic_2.13" }
exclusions-slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12" }
exclusions-utest = { module = "com.lihaoyi:utest_2.12" }
exclusions-utest = { module = "com.lihaoyi:utest_2.13" }
h2 = { module = "com.h2database:h2", version.ref = "h2" }
hadoop-client-minicluster = { module = "org.apache.hadoop:hadoop-client-minicluster", version.ref = "hadoop" }
log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j-main" }
Expand All @@ -45,32 +45,32 @@ opencypher-expressions = { module = "org.opencypher:expressions-9.0", version.re
opencypher-frontend = { module = "org.opencypher:front-end-9.0", version.ref = "cypher-frontend" }
opencypher-rewriting = { module = "org.opencypher:rewriting-9.0", version.ref = "cypher-frontend" }
opencypher-tck = { module = "org.opencypher:tck", version.ref = "cypher-tck" }
opencypher-tck-api = { module = "org.opencypher:tck-api_2.12", version.ref = "cypher-tck" }
opencypher-tck-api = { module = "org.opencypher:tck-api_2.13", version.ref = "cypher-tck" }
opencypher-util = { module = "org.opencypher:util-9.0", version.ref = "cypher-frontend" }
scala-claimant = { module = "org.spire-math:claimant_2.12", version.ref = "claimant" }
scala-eff = { module = "org.atnos:eff_2.12", version.ref = "eff" }
scala-fastparse = { module = "com.lihaoyi:fastparse_2.12", version.ref = "fastparse" }
scala-claimant = { module = "org.spire-math:claimant_2.13", version.ref = "claimant" }
scala-eff = { module = "org.atnos:eff_2.13", version.ref = "eff" }
scala-fastparse = { module = "com.lihaoyi:fastparse_2.13", version.ref = "fastparse" }
# Seems we need to lock this down, otherwise we get runtime errors on reflection
scala-lang-compiler = { module = "org.scala-lang:scala-compiler", version.ref = "scala-full" }
# Seems we need to lock this down, otherwise we get runtime errors on reflection
scala-lang-reflect = { module = "org.scala-lang:scala-reflect", version.ref = "scala-full" }
scala-library = { module = "org.scala-lang:scala-library", version.ref = "scala-full" }
scala-log4j-api = { module = "org.apache.logging.log4j:log4j-api-scala_2.12", version.ref = "log4j-scala" }
scala-spark-catalyst = { module = "org.apache.spark:spark-catalyst_2.12", version.ref = "spark" }
scala-spark-core = { module = "org.apache.spark:spark-core_2.12", version.ref = "spark" }
scala-spark-graphx = { module = "org.apache.spark:spark-graphx_2.12", version.ref = "spark" }
scala-spark-hive = { module = "org.apache.spark:spark-hive_2.12", version.ref = "spark" }
scala-spark-sql = { module = "org.apache.spark:spark-sql_2.12", version.ref = "spark" }
scala-typelevel-cats-core = { module = "org.typelevel:cats-core_2.12", version.ref = "cats" }
scala-typelevel-cats-laws = { module = "org.typelevel:cats-laws_2.12", version.ref = "cats" }
scala-typelevel-discipline = { module = "org.typelevel:discipline_2.12", version.ref = "discipline" }
scala-upickle = { module = "com.lihaoyi:upickle_2.12", version.ref = "upickle" }
scala-log4j-api = { module = "org.apache.logging.log4j:log4j-api-scala_2.13", version.ref = "log4j-scala" }
scala-spark-catalyst = { module = "org.apache.spark:spark-catalyst_2.13", version.ref = "spark" }
scala-spark-core = { module = "org.apache.spark:spark-core_2.13", version.ref = "spark" }
scala-spark-graphx = { module = "org.apache.spark:spark-graphx_2.13", version.ref = "spark" }
scala-spark-hive = { module = "org.apache.spark:spark-hive_2.13", version.ref = "spark" }
scala-spark-sql = { module = "org.apache.spark:spark-sql_2.13", version.ref = "spark" }
scala-typelevel-cats-core = { module = "org.typelevel:cats-core_2.13", version.ref = "cats" }
scala-typelevel-cats-laws = { module = "org.typelevel:cats-laws_2.13", version.ref = "cats" }
scala-typelevel-discipline = { module = "org.typelevel:discipline_2.13", version.ref = "discipline" }
scala-upickle = { module = "com.lihaoyi:upickle_2.13", version.ref = "upickle" }
testcontainers-neo4j = { module = "org.testcontainers:testcontainers-neo4j", version.ref = "testcontainers" }
testing-junit = { module = "junit:junit", version.ref = "junit-main" }
testing-junit-platform-runner = { module = "org.junit.platform:junit-platform-runner", version.ref = "junit-runner" }
testing-mockito-all = { module = "org.mockito:mockito-all", version.ref = "mockito" }
testing-scala-scalacheck = { module = "org.scalacheck:scalacheck_2.12", version.ref = "scalacheck" }
testing-scala-scalatest = { module = "org.scalatest:scalatest_2.12", version.ref = "scalatest" }
testing-scala-scalacheck = { module = "org.scalacheck:scalacheck_2.13", version.ref = "scalacheck" }
testing-scala-scalatest = { module = "org.scalatest:scalatest_2.13", version.ref = "scalatest" }

[plugins]
champeau-jmh = "me.champeau.jmh:0.7.3"
Expand Down
Loading