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

chore: bump scala to 2.13 #1851

Merged
merged 10 commits into from May 5, 2021
Merged

chore: bump scala to 2.13 #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
33d45de
chore: bump scala to 2.13
subotic Apr 30, 2021
4e654db
Merge branch 'main' into wip/DSP-1589-Bump-DSP-API-to-Scala-2-13
May 3, 2021
2ebc966
chore: Migrate code to Scala 2.13.
May 3, 2021
39fa890
chore: Fix broken things.
May 3, 2021
19f51b6
chore: Fix deps.
May 3, 2021
a502f46
chore: Fix more broken things.
May 3, 2021
48bd903
chore: Fix more build breakage.
May 3, 2021
6e9de84
chore: Fix test.
May 3, 2021
50eff6f
Merge branch 'main' into wip/DSP-1589-Bump-DSP-API-to-Scala-2-13
May 3, 2021
ee7ed70
chore: Fix compile error.
May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ http_archive(
# 2.12 is a default version, other versions can be use by passing them explicitly:
# scala_config(scala_version = "2.11.12")
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
scala_config(scala_version = "2.12.13")
scala_config(scala_version = "2.13.5")

# register default and our custom scala toolchain
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
Expand Down
360 changes: 180 additions & 180 deletions test_data/metadataE2EV2/metadata-flat.jsonld
View file
Open in desktop

Large diffs are not rendered by default.

107 changes: 53 additions & 54 deletions third_party/dependencies.bzl
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ load("//third_party:versions.bzl", "AKKA_VERSION", "AKKA_HTTP_VERSION", "JENA_VE

def dependencies():
#
# e.g., to reference use: @maven//com_typesafe_akka_akka_actor_2_12
# e.g., to reference use: @maven//com_typesafe_akka_akka_actor_2_13
#
# ATTENTION: Transitive dependencies need to be explicitly added
# to query: bazel query @maven//:all --output=build
Expand All @@ -16,19 +16,19 @@ def dependencies():
maven_install(
artifacts = [
# akka
"com.typesafe.akka:akka-actor_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-stream_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-slf4j_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-actor_2.13:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-stream_2.13:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-slf4j_2.13:%s" % (AKKA_VERSION),

# akka http
"com.typesafe.akka:akka-http_2.12:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-xml_2.12:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-spray-json_2.12:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-jackson_2.12:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http_2.13:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-xml_2.13:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-spray-json_2.13:%s" % (AKKA_HTTP_VERSION),
"com.typesafe.akka:akka-http-jackson_2.13:%s" % (AKKA_HTTP_VERSION),
"com.typesafe:config:1.3.3",

# CORS support
"ch.megard:akka-http-cors_2.12:1.0.0",
"ch.megard:akka-http-cors_2.13:1.0.0",

# Jena
"org.apache.jena:apache-jena-libs:%s" % (JENA_VERSION),
Expand All @@ -42,35 +42,35 @@ def dependencies():
),

# Logging
"com.typesafe.scala-logging:scala-logging_2.12:3.8.0",
"com.typesafe.scala-logging:scala-logging_2.13:3.9.3",
"ch.qos.logback:logback-classic:1.2.3",
"ch.qos.logback:logback-core:1.2.3",
"org.slf4j:log4j-over-slf4j:1.7.29",
"org.slf4j:jcl-over-slf4j:1.7.29",
"org.slf4j:slf4j-api:1.7.29",

# metrics
"io.kamon:kamon-core_2.12:2.0.0-RC1",
"io.kamon:kamon-scala-future_2.12:2.0.0-RC1",
"io.kamon:kamon-akka-http_2.12:2.0.0-RC1",
"io.kamon:kamon-prometheus_2.12:2.0.0-RC1",
"io.kamon:kamon-logback_2.12:2.0.0-RC1",
"io.kamon:kamon-core_2.13:2.1.5",
"io.kamon:kamon-scala-future_2.13:2.1.5",
"io.kamon:kamon-akka-http_2.13:2.1.5",
"io.kamon:kamon-prometheus_2.13:2.1.5",
"io.kamon:kamon-logback_2.13:2.1.5",
"org.aspectj:aspectjweaver:1.9.4",

# input validation
"commons-validator:commons-validator:1.6",

# authentication
"org.bouncycastle:bcprov-jdk15on:1.59",
"org.bouncycastle:bcprov-jdk15on:1.64",
"org.springframework.security:spring-security-core:5.1.5.RELEASE",
"com.pauldijou:jwt-spray-json_2.12:0.19.0",
"com.pauldijou:jwt-spray-json_2.13:5.0.0",

# caching
"net.sf.ehcache:ehcache:2.10.3",
"redis.clients:jedis:3.1.0-m4",

# serialization (used in caching)
"com.twitter:chill_2.12:0.9.3",
"com.twitter:chill_2.13:0.9.5",

# other
# "javax.transaction" % "transaction-api" % "1.1-rev-1",
Expand All @@ -87,24 +87,23 @@ def dependencies():
"org.eclipse.rdf4j:rdf4j-runtime:3.4.4",
"org.eclipse.rdf4j:rdf4j-client:3.4.4",
"org.eclipse.rdf4j:rdf4j-shacl:3.4.4",
"org.rogach:scallop_2.12:3.2.0",
"org.rogach:scallop_2.13:3.5.1",
"com.google.gwt:gwt-servlet:2.8.0",
"net.sf.saxon:Saxon-HE:9.9.0-2",

"org.scala-lang.modules:scala-xml_2.12:1.1.1",
"com.jsuereth:scala-arm_2.12:2.0",
"org.scala-lang.modules:scala-java8-compat_2.12:0.8.0",
"org.scala-lang.modules:scala-xml_2.13:1.1.1",
"org.scala-lang.modules:scala-java8-compat_2.13:0.9.1",

# provides akka jackson (json) support
"de.heikoseeberger:akka-http-circe_2.12:1.21.0",
"com.fasterxml.jackson.module:jackson-module-scala_2.12:2.9.4",
"de.heikoseeberger:akka-http-circe_2.13:1.36.0",
"com.fasterxml.jackson.module:jackson-module-scala_2.13:2.12.3",

"com.apicatalog:titanium-json-ld:0.8.5",
"javax.json:javax.json-api:1.1.4",
"org.glassfish:jakarta.json:1.1.6",

# swagger (api documentation)
"com.github.swagger-akka-http:swagger-akka-http_2.12:1.2.0",
"com.github.swagger-akka-http:swagger-akka-http_2.13:1.2.0",

# Java EE modules which are deprecated in Java SE 9, 10 and will be removed in Java SE 11
"javax.xml.bind:jaxb-api:2.2.12",
Expand All @@ -114,20 +113,20 @@ def dependencies():
"org.apache.httpcomponents:httpclient:4.5.6",

# Twirl templates
"com.typesafe.play:twirl-api_2.12:1.3.13",
"com.typesafe.play:twirl-api_2.13:1.5.1",

# scala stuff
"org.scala-lang.modules:scala-xml_2.12:1.2.0",
"org.scala-lang.modules:scala-xml_2.13:1.2.0",

# testing
"com.typesafe.akka:akka-testkit_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-stream-testkit_2.12:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-http-testkit_2.12:%s" % (AKKA_HTTP_VERSION),
"org.scalatest:scalatest_2.12:3.2.2",
"org.scalatest:scalatest-core_2.12:3.2.2",
"org.scalatest:scalatest-wordspec_2.12:3.2.2",
"org.scalatest:scalatest-matchers-core_2.12:3.2.2",
"org.scalatest:scalatest-shouldmatchers_2.12:3.2.2",
"com.typesafe.akka:akka-testkit_2.13:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-stream-testkit_2.13:%s" % (AKKA_VERSION),
"com.typesafe.akka:akka-http-testkit_2.13:%s" % (AKKA_HTTP_VERSION),
"org.scalatest:scalatest_2.13:3.2.2",
"org.scalatest:scalatest-core_2.13:3.2.2",
"org.scalatest:scalatest-wordspec_2.13:3.2.2",
"org.scalatest:scalatest-matchers-core_2.13:3.2.2",
"org.scalatest:scalatest-shouldmatchers_2.13:3.2.2",
"org.scalatest:scalatest-compatible:3.2.2",
"org.testcontainers:testcontainers:1.15.3",
"junit:junit:4.13",
Expand All @@ -139,7 +138,7 @@ def dependencies():
"org.seleniumhq.selenium:selenium-support:3.141.59",

# Graph for Scala
"org.scala-graph:graph-core_2.12:1.13.1",
"org.scala-graph:graph-core_2.13:1.13.1",
],
repositories = [
"https://repo.maven.apache.org/maven2",
Expand Down Expand Up @@ -174,33 +173,33 @@ ALL_WEBAPI_MAIN_DEPENDENCIES = [
]

BASE_TEST_DEPENDENCIES = [
"@maven//:com_typesafe_scala_logging_scala_logging_2_12",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_slf4j_slf4j_api",
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_testkit_2_12",
"@maven//:com_typesafe_akka_akka_http_2_12",
"@maven//:com_typesafe_akka_akka_http_core_2_12",
"@maven//:com_typesafe_akka_akka_http_testkit_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_testkit_2_13",
"@maven//:com_typesafe_akka_akka_http_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_akka_akka_http_testkit_2_13",
"@maven//:com_typesafe_akka_akka_stream_2_13",
"@maven//:com_typesafe_config",
"@maven//:org_scalatest_scalatest_2_12",
"@maven//:org_scalatest_scalatest_core_2_12",
"@maven//:org_scalatest_scalatest_wordspec_2_12",
"@maven//:org_scalatest_scalatest_matchers_core_2_12",
"@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
"@maven//:org_scalatest_scalatest_2_13",
"@maven//:org_scalatest_scalatest_core_2_13",
"@maven//:org_scalatest_scalatest_wordspec_2_13",
"@maven//:org_scalatest_scalatest_matchers_core_2_13",
"@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
"@maven//:org_scalatest_scalatest_compatible",
"@maven//:org_scalactic_scalactic_2_12",
"@maven//:org_scala_graph_graph_core_2_12",
"@maven//:org_scalactic_scalactic_2_13",
"@maven//:org_scala_graph_graph_core_2_13",
]

BASE_TEST_DEPENDENCIES_WITH_JSON = BASE_TEST_DEPENDENCIES + [
"@maven//:com_typesafe_akka_akka_http_spray_json_2_12",
"@maven//:com_typesafe_akka_akka_http_xml_2_12",
"@maven//:io_spray_spray_json_2_12",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
"@maven//:com_typesafe_akka_akka_http_xml_2_13",
"@maven//:io_spray_spray_json_2_13",
]

BASE_TEST_DEPENDENCIES_WITH_JSON_LD = BASE_TEST_DEPENDENCIES + [
"@maven//:io_spray_spray_json_2_12",
"@maven//:io_spray_spray_json_2_13",
"@maven//:com_apicatalog_titanium_json_ld",
"@maven//:javax_json_javax_json_api",
"@maven//:org_glassfish_jakarta_json"
Expand Down
4 changes: 2 additions & 2 deletions third_party/versions.bzl
View file
Open in desktop
@@ -1,8 +1,8 @@
"""Primary location for setting Knora-API project wide versions"""

SCALA_VERSION = "2.12.11"
SCALA_VERSION = "2.13.5"
AKKA_VERSION = "2.6.5"
AKKA_HTTP_VERSION = "10.2.0"
AKKA_HTTP_VERSION = "10.2.4"
JENA_VERSION = "3.14.0"
METRICS_VERSION = "4.0.1"

Expand Down
80 changes: 40 additions & 40 deletions webapi/BUILD.bazel
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ scala_library(
runtime_deps = [
"@maven//:ch_qos_logback_logback_classic",
"@maven//:ch_qos_logback_logback_core",
"@maven//:com_typesafe_akka_akka_slf4j_2_12",
"@maven//:com_typesafe_akka_akka_slf4j_2_13",
"@maven//:org_slf4j_log4j_over_slf4j",
],
deps = [
Expand All @@ -54,48 +54,47 @@ scala_library(
"//webapi/src/main/scala/org/knora/webapi/util",
"//webapi/src/main/scala/org/knora/webapi/util/cache",
# Logging
"@maven//:com_typesafe_scala_logging_scala_logging_2_12",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_slf4j_jcl_over_slf4j",
"@maven//:org_slf4j_slf4j_api",
#
"@maven//:ch_megard_akka_http_cors_2_12",
"@maven//:ch_megard_akka_http_cors_2_13",
"@maven//:com_fasterxml_jackson_core_jackson_annotations",
"@maven//:com_fasterxml_jackson_core_jackson_databind",
"@maven//:com_github_andrewoma_dexx_collection",
"@maven//:com_apicatalog_titanium_json_ld",
"@maven//:javax_json_javax_json_api",
"@maven//:org_glassfish_jakarta_json",
"@maven//:com_github_swagger_akka_http_swagger_akka_http_2_12",
"@maven//:com_github_swagger_akka_http_swagger_akka_http_2_13",
"@maven//:com_google_gwt_gwt_servlet",
"@maven//:com_ibm_icu_icu4j",
"@maven//:com_jsuereth_scala_arm_2_12",
"@maven//:com_pauldijou_jwt_core_2_12",
"@maven//:com_pauldijou_jwt_json_common_2_12",
"@maven//:com_pauldijou_jwt_spray_json_2_12",
"@maven//:com_pauldijou_jwt_core_2_13",
"@maven//:com_pauldijou_jwt_json_common_2_13",
"@maven//:com_pauldijou_jwt_spray_json_2_13",
"@maven//:com_sksamuel_diff_diff",
"@maven//:com_twitter_chill_2_12",
"@maven//:com_twitter_chill_2_13",
# Akka
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_http_2_12",
"@maven//:com_typesafe_akka_akka_http_core_2_12",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_12",
"@maven//:com_typesafe_akka_akka_parsing_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_http_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
"@maven//:com_typesafe_akka_akka_parsing_2_13",
"@maven//:com_typesafe_akka_akka_stream_2_13",
"@maven//:com_typesafe_config",
# Templates
"@maven//:com_typesafe_play_twirl_api_2_12",
"@maven//:com_typesafe_play_twirl_api_2_13",
"@maven//:commons_cli_commons_cli",
"@maven//:commons_codec_commons_codec",
"@maven//:commons_io_commons_io",
"@maven//:commons_validator_commons_validator",
# Telemetry
"@maven//:io_kamon_kamon_core_2_12",
"@maven//:io_kamon_kamon_instrumentation_common_2_12",
# "@maven//:io_kamon_kamon_logback_2_12",
# "@maven//:io_kamon_kamon_prometheus_2_12",
"@maven//:io_kamon_kamon_scala_future_2_12",
"@maven//:io_kamon_kamon_core_2_13",
"@maven//:io_kamon_kamon_instrumentation_common_2_13",
# "@maven//:io_kamon_kamon_logback_2_13",
# "@maven//:io_kamon_kamon_prometheus_2_13",
"@maven//:io_kamon_kamon_scala_future_2_13",
#
"@maven//:io_spray_spray_json_2_12",
"@maven//:io_spray_spray_json_2_13",
"@maven//:io_swagger_swagger_annotations",
"@maven//:io_swagger_swagger_jaxrs",
"@maven//:io_swagger_swagger_models",
Expand All @@ -119,9 +118,9 @@ scala_library(
"@maven//:org_apache_lucene_lucene_core",
"@maven//:org_eclipse_rdf4j_rdf4j_client",
"@maven//:org_jodd_jodd",
"@maven//:org_rogach_scallop_2_12",
"@maven//:org_scala_lang_modules_scala_java8_compat_2_12",
"@maven//:org_scala_lang_modules_scala_xml_2_12",
"@maven//:org_rogach_scallop_2_13",
"@maven//:org_scala_lang_modules_scala_java8_compat_2_13",
"@maven//:org_scala_lang_modules_scala_xml_2_13",
"@maven//:org_scala_lang_scala_library",
"@maven//:org_scala_lang_scala_reflect",
"@maven//:org_springframework_security_spring_security_core",
Expand All @@ -145,7 +144,7 @@ scala_library(
runtime_deps = [
"@maven//:ch_qos_logback_logback_classic",
"@maven//:ch_qos_logback_logback_core",
"@maven//:com_typesafe_akka_akka_slf4j_2_12",
"@maven//:com_typesafe_akka_akka_slf4j_2_13",
"@maven//:org_slf4j_log4j_over_slf4j",
],
deps = [
Expand All @@ -163,27 +162,28 @@ scala_library(
"//webapi/src/main/scala/org/knora/webapi/store",
"//webapi/src/main/scala/org/knora/webapi/util",
# Logging
"@maven//:com_typesafe_scala_logging_scala_logging_2_12",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_slf4j_slf4j_api",
# Test Libs
"@maven//:com_typesafe_akka_akka_testkit_2_12",
"@maven//:com_typesafe_akka_akka_http_testkit_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_http_2_12",
"@maven//:com_typesafe_akka_akka_http_core_2_12",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_testkit_2_13",
"@maven//:com_typesafe_akka_akka_http_testkit_2_13",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_http_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
"@maven//:com_typesafe_akka_akka_stream_2_13",
"@maven//:com_typesafe_config",
"@maven//:io_spray_spray_json_2_12",
"@maven//:org_scalactic_scalactic_2_12",
"@maven//:org_scalatest_scalatest_core_2_12",
"@maven//:org_scalatest_scalatest_wordspec_2_12",
"@maven//:org_scalatest_scalatest_matchers_core_2_12",
"@maven//:org_scalatest_scalatest_shouldmatchers_2_12",
"@maven//:io_spray_spray_json_2_13",
"@maven//:org_scalactic_scalactic_2_13",
"@maven//:org_scalatest_scalatest_core_2_13",
"@maven//:org_scalatest_scalatest_wordspec_2_13",
"@maven//:org_scalatest_scalatest_matchers_core_2_13",
"@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
"@maven//:org_scalatest_scalatest_compatible",
"@maven//:org_testcontainers_testcontainers",
"@maven//:junit_junit",
"@maven//:org_apache_commons_commons_pool2",
"@maven//:redis_clients_jedis",
"@maven//:org_bouncycastle_bcprov_jdk15on",
],
)
6 changes: 3 additions & 3 deletions webapi/src/main/scala/org/knora/webapi/BUILD.bazel
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ scala_library(
srcs = glob(["*.scala"]),
unused_dependency_checker_mode = "warn",
deps = [
"@maven//:com_typesafe_akka_akka_actor_2_12",
"@maven//:com_typesafe_akka_akka_http_core_2_12",
"@maven//:com_typesafe_akka_akka_stream_2_12",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_akka_akka_stream_2_13",
],
)