Skip to content
Permalink
Browse files
chore(build): cleanup (#1880)
  • Loading branch information
subotic committed Jun 17, 2021
1 parent d5e70ba commit 749e8eae664a12e753d73fd497b1d6236fbc711d
@@ -1 +1 @@
4.1.0
rolling
@@ -178,62 +178,12 @@ load("@maven//:defs.bzl", "pinned_maven_install")

pinned_maven_install()

#####################################
# Scala Annex (Twirl dependency) #
#####################################
rules_scala_annex_version = "2503b72a166610c14170b117c51033b42a32e48b" # 29.06.2020

rules_scala_annex_sha256 = "52d677dc8205db25a49824aade45984e3ef1b79c3bf761efede35d921033c3a4"

http_archive(
name = "rules_scala_annex",
sha256 = rules_scala_annex_sha256,
strip_prefix = "rules_scala-{}".format(rules_scala_annex_version),
url = "https://github.com/higherkindness/rules_scala/archive/{}.zip".format(rules_scala_annex_version),
)

load("@rules_scala_annex//rules/scala:workspace.bzl", "scala_register_toolchains", "scala_repositories")

scala_repositories()

load("@annex//:defs.bzl", annex_pinned_maven_install = "pinned_maven_install")

annex_pinned_maven_install()

scala_register_toolchains()

load("@rules_scala_annex//rules/scalafmt:workspace.bzl", "scalafmt_default_config", "scalafmt_repositories")

scalafmt_repositories()

load("@annex_scalafmt//:defs.bzl", annex_scalafmt_pinned_maven_install = "pinned_maven_install")

annex_scalafmt_pinned_maven_install()

scalafmt_default_config()

load("@rules_scala_annex//rules/scala_proto:workspace.bzl", "scala_proto_register_toolchains", "scala_proto_repositories")

scala_proto_repositories()

load("@annex_proto//:defs.bzl", annex_proto_pinned_maven_install = "pinned_maven_install")

annex_proto_pinned_maven_install()

scala_proto_register_toolchains()

# Specify the scala compiler we wish to use; in this case, we'll use the default one specified in rules_scala_annex
bind(
name = "default_scala",
actual = "@rules_scala_annex//src/main/scala:zinc_2_12_10",
)

#####################################
# Twirl templates #
#####################################
rules_twirl_version = "35389750d178f17f7ddd85b9335f7b8b8d662f78" # 29.04.2020
rules_twirl_version = "9ac789845e3a481fe520af57bd47a4261edb684f" # 29.04.2020

rules_twirl_version_sha256 = "d072049d0917b87e1eb677a4255509a7133ca71fc21c8de4b4536ca030eb3d3a"
rules_twirl_version_sha256 = "b1698a2a59b76dc9df233314c2a1ca8cee4a0477665cff5eafd36f92057b2044"

http_archive(
name = "io_bazel_rules_twirl",
@@ -258,10 +208,10 @@ twirl_pinned_maven_install()
# See https://github.com/bazelbuild/rules_go for the up to date setup instructions.
http_archive(
name = "io_bazel_rules_go",
sha256 = "d1ffd055969c8f8d431e2d439813e42326961d0942bdf734d2c95dc30c369566",
sha256 = "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.5/rules_go-v0.24.5.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.24.5/rules_go-v0.24.5.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz",
],
)

@@ -5,6 +5,7 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library",
scala_library(
name = "app",
srcs = glob(["*.scala"]),
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
deps = [
"//webapi/src/main/scala/org/knora/webapi",
@@ -21,7 +22,6 @@ scala_library(
"//webapi/src/main/scala/org/knora/webapi/store",
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice/inmem",
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice/redis",
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings",
"//webapi/src/main/scala/org/knora/webapi/util/cache",
"@maven//:ch_megard_akka_http_cors_2_13",
@@ -5,6 +5,7 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
scala_library(
name = "contributors",
srcs = glob(["**/*.scala"]),
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
runtime_deps = [
"@maven//:ch_qos_logback_logback_classic",
@@ -4,7 +4,12 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")

scala_library(
name = "core",
srcs = glob(["*.scala"]),
srcs = [
"ActorMaker.scala",
"Core.scala",
"LiveActorMaker.scala",
],
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
deps = [
"//webapi/src/main/scala/org/knora/webapi/settings",
@@ -4,7 +4,11 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")

scala_library(
name = "exceptions",
srcs = glob(["*.scala"]),
srcs = [
"Exceptions.scala",
"package.scala",
],
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
deps = [
"@maven//:com_typesafe_akka_akka_actor_2_13",
@@ -17,7 +17,7 @@
* License along with Knora. If not, see <http://www.gnu.org/licenses/>.
*/

package org.knora.webapi
package org.knora.webapi.exceptions

package object exceptions {
def deserializationError(msg: String, cause: Throwable = null, fieldNames: List[String] = Nil) =
@@ -4,7 +4,10 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")

scala_library(
name = "feature",
srcs = glob(["**/*.scala"]),
srcs = [
"FeatureFactory.scala",
],
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
deps = [
"//webapi/src/main/scala/org/knora/webapi",
@@ -5,6 +5,7 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
scala_library(
name = "http",
srcs = glob(["*.scala"]),
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
deps = [
"//webapi/src/main/scala/org/knora/webapi/http/directives",
@@ -4,7 +4,10 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")

scala_library(
name = "instrumentation",
srcs = glob(["*.scala"]),
srcs = [
"InstrumentationSupport.scala",
],
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
deps = [
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
@@ -5,6 +5,7 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
scala_library(
name = "store",
srcs = glob(["**/*.scala"]),
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
deps = [
"//webapi/src/main/scala/org/knora/webapi",
@@ -17,7 +18,6 @@ scala_library(
"//webapi/src/main/scala/org/knora/webapi/settings",
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
"//webapi/src/main/scala/org/knora/webapi/util",
"@maven//:com_twitter_chill_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",
@@ -31,7 +31,6 @@ scala_library(
"@maven//:io_spray_spray_json_2_13",
"@maven//:org_apache_commons_commons_csv",
"@maven//:org_apache_commons_commons_lang3",
"@maven//:org_apache_commons_commons_pool2",
"@maven//:org_apache_httpcomponents_httpclient",
"@maven//:org_apache_httpcomponents_httpclient_cache",
"@maven//:org_apache_httpcomponents_httpcore",
@@ -43,6 +42,5 @@ scala_library(
"@maven//:org_apache_jena_jena_text",
"@maven//:org_apache_lucene_lucene_core",
"@maven//:org_slf4j_slf4j_api",
"@maven//:redis_clients_jedis",
],
)
@@ -13,40 +13,12 @@ scala_library(
unused_dependency_checker_mode = "warn",
deps = [
"//webapi/src/main/scala/org/knora/webapi",
"//webapi/src/main/scala/org/knora/webapi/core",
"//webapi/src/main/scala/org/knora/webapi/exceptions",
"//webapi/src/main/scala/org/knora/webapi/feature",
"//webapi/src/main/scala/org/knora/webapi/instrumentation",
"//webapi/src/main/scala/org/knora/webapi/messages",
"//webapi/src/main/scala/org/knora/webapi/routing",
"//webapi/src/main/scala/org/knora/webapi/settings",
"//webapi/src/main/scala/org/knora/webapi/util",
"@maven//:com_twitter_chill_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//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:commons_cli_commons_cli",
"@maven//:commons_codec_commons_codec",
"@maven//:commons_io_commons_io",
"@maven//:io_spray_spray_json_2_13",
"@maven//:org_apache_commons_commons_csv",
"@maven//:org_apache_commons_commons_lang3",
"@maven//:org_apache_commons_commons_pool2",
"@maven//:org_apache_httpcomponents_httpclient",
"@maven//:org_apache_httpcomponents_httpclient_cache",
"@maven//:org_apache_httpcomponents_httpcore",
"@maven//:org_apache_jena_apache_jena_libs",
"@maven//:org_apache_jena_jena_arq",
"@maven//:org_apache_jena_jena_base",
"@maven//:org_apache_jena_jena_core",
"@maven//:org_apache_jena_jena_tdb",
"@maven//:org_apache_jena_jena_text",
"@maven//:org_apache_lucene_lucene_core",
"@maven//:org_slf4j_slf4j_api",
"@maven//:redis_clients_jedis",
],
)
@@ -12,11 +12,8 @@ scala_library(
deps = [
"//webapi/src/main/scala/org/knora/webapi",
"//webapi/src/main/scala/org/knora/webapi/exceptions",
"//webapi/src/main/scala/org/knora/webapi/instrumentation",
"//webapi/src/main/scala/org/knora/webapi/messages",
"//webapi/src/main/scala/org/knora/webapi/settings",
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_slf4j_slf4j_api",
@@ -17,7 +17,6 @@ scala_library(
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization",
"//webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings",
"@maven//:com_typesafe_akka_akka_actor_2_13",
"@maven//:com_typesafe_akka_akka_http_core_2_13",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_apache_commons_commons_pool2",
@@ -11,40 +11,9 @@ scala_library(
unused_dependency_checker_mode = "warn",
deps = [
"//webapi/src/main/scala/org/knora/webapi",
"//webapi/src/main/scala/org/knora/webapi/core",
"//webapi/src/main/scala/org/knora/webapi/exceptions",
"//webapi/src/main/scala/org/knora/webapi/feature",
"//webapi/src/main/scala/org/knora/webapi/instrumentation",
"//webapi/src/main/scala/org/knora/webapi/messages",
"//webapi/src/main/scala/org/knora/webapi/routing",
"//webapi/src/main/scala/org/knora/webapi/settings",
"//webapi/src/main/scala/org/knora/webapi/util",
"@maven//:com_twitter_chill_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//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:commons_cli_commons_cli",
"@maven//:commons_codec_commons_codec",
"@maven//:commons_io_commons_io",
"@maven//:io_spray_spray_json_2_13",
"@maven//:org_apache_commons_commons_csv",
"@maven//:org_apache_commons_commons_lang3",
"@maven//:org_apache_commons_commons_pool2",
"@maven//:org_apache_httpcomponents_httpclient",
"@maven//:org_apache_httpcomponents_httpclient_cache",
"@maven//:org_apache_httpcomponents_httpcore",
"@maven//:org_apache_jena_apache_jena_libs",
"@maven//:org_apache_jena_jena_arq",
"@maven//:org_apache_jena_jena_base",
"@maven//:org_apache_jena_jena_core",
"@maven//:org_apache_jena_jena_tdb",
"@maven//:org_apache_jena_jena_text",
"@maven//:org_apache_lucene_lucene_core",
"@maven//:org_slf4j_slf4j_api",
"@maven//:redis_clients_jedis",
],
)
@@ -4,7 +4,8 @@ load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")

scala_library(
name = "cache",
srcs = glob(["*.scala"]),
srcs = ["CacheUtil.scala"],
scalacopts = ["-deprecation"],
unused_dependency_checker_mode = "warn",
deps = [
"//webapi/src/main/scala/org/knora/webapi/exceptions",
@@ -30,7 +30,6 @@ scala_test(
"@maven//:com_typesafe_config",
"@maven//:com_typesafe_scala_logging_scala_logging_2_13",
"@maven//:org_scalactic_scalactic_2_13",
"@maven//:org_scalatest_scalatest_2_13",
"@maven//:org_scalatest_scalatest_compatible",
"@maven//:org_scalatest_scalatest_core_2_13",
"@maven//:org_scalatest_scalatest_matchers_core_2_13",

0 comments on commit 749e8ea

Please sign in to comment.