Skip to content

Commit dd9dd95

Browse files
kumar-zlainikhil-zlai
kumar-zlai
and
nikhil-zlai
authored
Move scala dependencies to separate repos for 2.12 and 2.13 (#413)
## Summary Moved scala dependencies to separate scala_2_12 and scala_2_13 repositories so we can load the right repo based on config instead of loading both. ## Checklist - [ ] Added Unit Tests - [x] Covered by existing CI - [ ] Integration tested - [ ] Documentation update <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Summary by CodeRabbit - **Chores** - Upgraded Scala dependencies to newer versions with updated verification, ensuring improved stability. - Removed outdated package references to streamline dependency management. - Introduced new repository configurations for Scala 2.12 and 2.13 to enhance dependency management. - Added `.gitignore` entry to exclude `node_modules` in the `authoring/vscode` path. - Created `LICENSE` file with MIT License text for the new extension. - **New Features** - Introduced a Visual Studio Code extension with a CodeLens provider for Python files, allowing users to evaluate variables directly in the editor. - **Refactor** - Updated dependency declarations to utilize a new method for handling Scala artifacts, improving consistency across the project. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Nikhil Simha <[email protected]>
1 parent e09bc86 commit dd9dd95

File tree

15 files changed

+1454
-8285
lines changed

15 files changed

+1454
-8285
lines changed

‎aggregator/BUILD.bazel

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ scala_library(
44
format = select({
55
"//tools/config:scala_2_13": False, # Disable for 2.13
66
"//conditions:default": True, # Enable for other versions
7-
}),
7+
}),
88
visibility = ["//visibility:public"],
99
deps = [
1010
"//api:lib",
@@ -17,7 +17,7 @@ scala_library(
1717
maven_artifact("org.apache.commons:commons-lang3"),
1818
maven_artifact("org.slf4j:slf4j-api"),
1919
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
20-
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
20+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
2121
],
2222
)
2323

@@ -33,19 +33,19 @@ test_deps = [
3333
maven_artifact("org.apache.datasketches:datasketches-java"),
3434
maven_artifact("org.apache.commons:commons-lang3"),
3535
maven_artifact("org.apache.commons:commons-math3"),
36-
maven_artifact("org.scala-lang.modules:scala-collection-compat_2.12"),
36+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
3737
# Testing
38-
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
39-
maven_scala_artifact("org.scalatest:scalatest-core"),
40-
maven_scala_artifact("org.scalatest:scalatest"),
41-
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
42-
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
43-
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
44-
maven_scala_artifact("org.scalactic:scalactic"),
45-
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
46-
maven_scala_artifact("org.mockito:mockito-scala"),
38+
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
39+
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
40+
scala_artifact_with_suffix("org.scalatest:scalatest"),
41+
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
42+
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
43+
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
44+
scala_artifact_with_suffix("org.scalactic:scalactic"),
45+
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
46+
scala_artifact_with_suffix("org.mockito:mockito-scala"),
4747
maven_artifact("org.mockito:mockito-core"),
48-
maven_artifact("org.scalatest:scalatest-compatible"),
48+
scala_artifact("org.scalatest:scalatest-compatible"),
4949
maven_artifact("junit:junit"),
5050
maven_artifact("com.novocode:junit-interface"),
5151
]
@@ -56,7 +56,7 @@ scala_library(
5656
format = select({
5757
"//tools/config:scala_2_13": False, # Disable for 2.13
5858
"//conditions:default": True, # Enable for other versions
59-
}),
59+
}),
6060
visibility = ["//visibility:public"],
6161
deps = test_deps,
6262
)

‎api/BUILD.bazel

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ scala_library(
2727
format = select({
2828
"//tools/config:scala_2_13": False, # Disable for 2.13
2929
"//conditions:default": True, # Enable for other versions
30-
}),
30+
}),
3131
visibility = ["//visibility:public"],
3232
deps = [
3333
":thrift_java",
@@ -38,8 +38,8 @@ scala_library(
3838
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
3939
maven_artifact("org.apache.commons:commons-lang3"),
4040
maven_artifact("com.google.code.gson:gson"),
41-
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
42-
maven_scala_artifact("org.scala-lang.modules:scala-parser-combinators"),
41+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
42+
scala_artifact_with_suffix("org.scala-lang.modules:scala-parser-combinators"),
4343
],
4444
)
4545

@@ -53,19 +53,19 @@ test_deps = [
5353
maven_artifact("org.slf4j:slf4j-api"),
5454
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
5555
# Testing
56-
maven_scala_artifact("org.scala-lang.modules:scala-parser-combinators"),
57-
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
58-
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
59-
maven_scala_artifact("org.scalatest:scalatest-core"),
60-
maven_scala_artifact("org.scalatest:scalatest"),
61-
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
62-
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
63-
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
64-
maven_scala_artifact("org.scalactic:scalactic"),
65-
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
66-
maven_scala_artifact("org.mockito:mockito-scala"),
56+
scala_artifact_with_suffix("org.scala-lang.modules:scala-parser-combinators"),
57+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
58+
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
59+
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
60+
scala_artifact_with_suffix("org.scalatest:scalatest"),
61+
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
62+
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
63+
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
64+
scala_artifact_with_suffix("org.scalactic:scalactic"),
65+
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
66+
scala_artifact_with_suffix("org.mockito:mockito-scala"),
6767
maven_artifact("org.mockito:mockito-core"),
68-
maven_artifact("org.scalatest:scalatest-compatible"),
68+
scala_artifact("org.scalatest:scalatest-compatible"),
6969
maven_artifact("junit:junit"),
7070
maven_artifact("com.novocode:junit-interface"),
7171
]
@@ -76,7 +76,7 @@ scala_library(
7676
format = select({
7777
"//tools/config:scala_2_13": False, # Disable for 2.13
7878
"//conditions:default": True, # Enable for other versions
79-
}),
79+
}),
8080
visibility = ["//visibility:public"],
8181
deps = test_deps,
8282
)

‎cloud_aws/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ scala_library(
1414
maven_artifact("software.amazon.awssdk:utils"),
1515
maven_artifact("com.google.guava:guava"),
1616
maven_artifact("org.slf4j:slf4j-api"),
17-
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
17+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
1818
"//api:lib",
1919
"//api:thrift_java",
2020
"//online:lib",
@@ -32,9 +32,9 @@ test_deps = [
3232
maven_artifact("software.amazon.awssdk:utils"),
3333
maven_artifact("software.amazon.awssdk:auth"),
3434
maven_artifact("software.amazon.awssdk:identity-spi"),
35-
maven_scala_artifact("org.typelevel:cats-core"),
35+
scala_artifact_with_suffix("org.typelevel:cats-core"),
3636
maven_artifact("com.amazonaws:DynamoDBLocal"),
37-
maven_scala_artifact("com.chuusai:shapeless"),
37+
scala_artifact_with_suffix("com.chuusai:shapeless"),
3838
] + _CIRCE_DEPS + _SCALA_TEST_DEPS
3939

4040
scala_library(

‎cloud_gcp/BUILD.bazel

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ scala_library(
1212
"//online:lib",
1313
"//spark:lib",
1414
"//tools/build_rules/spark:spark-exec",
15-
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
16-
maven_scala_artifact("org.json4s:json4s-core"),
17-
maven_scala_artifact("org.json4s:json4s-jackson"),
18-
maven_scala_artifact("org.json4s:json4s-ast"),
19-
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
20-
maven_scala_artifact("org.rogach:scallop"),
15+
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
16+
scala_artifact_with_suffix("org.json4s:json4s-core"),
17+
scala_artifact_with_suffix("org.json4s:json4s-jackson"),
18+
scala_artifact_with_suffix("org.json4s:json4s-ast"),
19+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
20+
scala_artifact_with_suffix("org.rogach:scallop"),
2121
maven_artifact("com.google.cloud:google-cloud-core"),
2222
maven_artifact("com.google.cloud:google-cloud-bigquery"),
2323
maven_artifact("com.google.cloud:google-cloud-bigtable"),
@@ -26,7 +26,7 @@ scala_library(
2626
maven_artifact("com.google.cloud.bigdataoss:gcsio"),
2727
maven_artifact("com.google.cloud.bigdataoss:util-hadoop"),
2828
maven_artifact("com.google.cloud.hosted.kafka:managed-kafka-auth-login-handler"),
29-
maven_scala_artifact("com.google.cloud.spark:spark-bigquery-with-dependencies"),
29+
scala_artifact_with_suffix("com.google.cloud.spark:spark-bigquery-with-dependencies"),
3030
maven_artifact("com.google.api:api-common"),
3131
maven_artifact("com.google.api.grpc:proto-google-cloud-dataproc-v1"),
3232
maven_artifact("com.google.api:gax"),
@@ -47,7 +47,7 @@ jvm_binary(
4747
main_class = "ai.chronon.integrations.cloud_gcp.DataprocSubmitter",
4848
runtime_deps = [
4949
":cloud_gcp_lib",
50-
maven_scala_artifact("org.apache.iceberg:iceberg-spark-runtime-3.5")
50+
scala_artifact_with_suffix("org.apache.iceberg:iceberg-spark-runtime-3.5")
5151
],
5252
)
5353

@@ -59,8 +59,8 @@ test_deps = [
5959
"//spark:lib",
6060
"//tools/build_rules/spark:spark-exec",
6161
# Libraries
62-
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
63-
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
62+
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
63+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
6464
maven_artifact("com.google.cloud:google-cloud-bigquery"),
6565
maven_artifact("com.google.cloud:google-cloud-bigtable"),
6666
maven_artifact("com.google.cloud:google-cloud-dataproc"),
@@ -70,22 +70,22 @@ test_deps = [
7070
maven_artifact("com.google.cloud:google-cloud-bigtable-emulator"),
7171
maven_artifact("com.google.api:api-common"),
7272
maven_artifact("com.google.api.grpc:proto-google-cloud-dataproc-v1"),
73-
maven_scala_artifact("com.google.cloud.spark:spark-bigquery-with-dependencies"),
73+
scala_artifact_with_suffix("com.google.cloud.spark:spark-bigquery-with-dependencies"),
7474
maven_artifact("com.google.api:gax"),
7575
maven_artifact("com.google.protobuf:protobuf-java"),
7676
maven_artifact("org.apache.hadoop:hadoop-client-api"),
7777
# Testing
78-
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
79-
maven_scala_artifact("org.scalatest:scalatest-core"),
80-
maven_scala_artifact("org.scalatest:scalatest"),
81-
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
82-
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
83-
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
84-
maven_scala_artifact("org.scalactic:scalactic"),
85-
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
86-
maven_scala_artifact("org.mockito:mockito-scala"),
78+
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
79+
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
80+
scala_artifact_with_suffix("org.scalatest:scalatest"),
81+
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
82+
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
83+
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
84+
scala_artifact_with_suffix("org.scalactic:scalactic"),
85+
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
86+
scala_artifact_with_suffix("org.mockito:mockito-scala"),
8787
maven_artifact("org.mockito:mockito-core"),
88-
maven_artifact("org.scalatest:scalatest-compatible"),
88+
scala_artifact("org.scalatest:scalatest-compatible"),
8989
maven_artifact("junit:junit"),
9090
maven_artifact("com.novocode:junit-interface"),
9191
]

‎flink/BUILD.bazel

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ scala_library(
1212
"//api:thrift_java",
1313
"//online:lib",
1414
"//tools/build_rules/spark:spark-exec",
15-
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
16-
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
17-
maven_scala_artifact("org.rogach:scallop"),
15+
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
16+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
17+
scala_artifact_with_suffix("org.rogach:scallop"),
1818
maven_artifact("io.dropwizard.metrics:metrics-core"),
1919
maven_artifact("org.apache.kafka:kafka-clients"),
2020
maven_artifact("org.slf4j:slf4j-api"),
@@ -35,8 +35,8 @@ test_deps = _FLINK_TEST_DEPS + [
3535
"//aggregator:lib",
3636
"//tools/build_rules/spark:spark-exec",
3737
# Libraries
38-
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
39-
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
38+
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
39+
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
4040
maven_artifact("org.slf4j:slf4j-api"),
4141
maven_artifact("org.apache.logging.log4j:log4j-api"),
4242
maven_artifact("org.apache.logging.log4j:log4j-core"),
@@ -47,17 +47,17 @@ test_deps = _FLINK_TEST_DEPS + [
4747
maven_artifact("org.apache.kafka:kafka-clients"),
4848
maven_artifact("com.google.protobuf:protobuf-java"),
4949
# Testing
50-
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
51-
maven_scala_artifact("org.scalatest:scalatest-core"),
52-
maven_scala_artifact("org.scalatest:scalatest"),
53-
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
54-
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
55-
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
56-
maven_scala_artifact("org.scalactic:scalactic"),
57-
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
58-
maven_scala_artifact("org.mockito:mockito-scala"),
50+
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
51+
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
52+
scala_artifact_with_suffix("org.scalatest:scalatest"),
53+
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
54+
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
55+
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
56+
scala_artifact_with_suffix("org.scalactic:scalactic"),
57+
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
58+
scala_artifact_with_suffix("org.mockito:mockito-scala"),
5959
maven_artifact("org.mockito:mockito-core"),
60-
maven_artifact("org.scalatest:scalatest-compatible"),
60+
scala_artifact("org.scalatest:scalatest-compatible"),
6161
maven_artifact("junit:junit"),
6262
maven_artifact("com.novocode:junit-interface"),
6363
]

0 commit comments

Comments
 (0)