bump scalameta; refactor version string

bazelbuild · Feb 4, 2023 · 8fcbbc9 · 8fcbbc9
1 parent 110442d
commit 8fcbbc9
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 70 deletions.
diff --git a/third_party/repositories/scala_2_11.bzl b/third_party/repositories/scala_2_11.bzl
@@ -1,4 +1,5 @@
 scala_version = "2.11.12"
+scalameta_version = "4.7.3"
 
 artifacts = {
     "io_bazel_rules_scala_scala_library": {
@@ -69,18 +70,6 @@ artifacts = {
         "artifact": "org.scala-lang.modules:scala-parser-combinators_2.11:1.1.2",
         "sha256": "3e0889e95f5324da6420461f7147cb508241ed957ac5cfedc25eef19c5448f26",
     },
-    "org_scalameta_common": {
-        "artifact": "org.scalameta:common_2.11:4.3.0",
-        "sha256": "6330798bcbd78d14d371202749f32efda0465c3be5fd057a6055a67e21335ba0",
-        "deps": [
-            "@com_lihaoyi_sourcecode",
-            "@io_bazel_rules_scala_scala_library",
-        ],
-    },
-    "org_scalameta_semanticdb_scalac": {
-        "artifact": "org.scalameta:semanticdb-scalac_2.11.12:4.7.3",
-        "sha256": "0db52fc6639f73b15c3fb9fc1cb441704399f0d8dee8352ca1cf359630e7ca0f",
-    },
     "org_scalameta_fastparse": {
         "artifact": "org.scalameta:fastparse_2.11:1.0.1",
         "sha256": "49ecc30a4b47efc0038099da0c97515cf8f754ea631ea9f9935b36ca7d41b733",
@@ -105,28 +94,28 @@ artifacts = {
             "@io_bazel_rules_scala_scala_library",
         ],
     },
-    "org_scalameta_parsers": {
-        "artifact": "org.scalameta:parsers_2.11:4.3.0",
-        "sha256": "724382abfac27b32dec6c21210562bc7e1b09b5268ccb704abe66dcc8844beeb",
+    "org_scalameta_semanticdb_scalac": {
+        "artifact": "org.scalameta:semanticdb-scalac_{}:{}".format(scala_version, scalameta_version),
+        "sha256": "0db52fc6639f73b15c3fb9fc1cb441704399f0d8dee8352ca1cf359630e7ca0f",
+    },
+    "org_scalameta_common": {
+        "artifact": "org.scalameta:common_2.11:{}".format(scalameta_version),
+        "sha256": "6330798bcbd78d14d371202749f32efda0465c3be5fd057a6055a67e21335ba0",
         "deps": [
+            "@com_lihaoyi_sourcecode",
             "@io_bazel_rules_scala_scala_library",
-            "@org_scalameta_trees",
         ],
     },
-    "org_scalameta_scalafmt_core": {
-        "artifact": "org.scalameta:scalafmt-core_2.11:2.3.2",
-        "sha256": "6bf391e0e1d7369fda83ddaf7be4d267bf4cbccdf2cc31ff941999a78c30e67f",
+    "org_scalameta_parsers": {
+        "artifact": "org.scalameta:parsers_2.11:{}".format(scalameta_version),
+        "sha256": "724382abfac27b32dec6c21210562bc7e1b09b5268ccb704abe66dcc8844beeb",
         "deps": [
-            "@com_geirsson_metaconfig_core",
-            "@com_geirsson_metaconfig_typesafe_config",
             "@io_bazel_rules_scala_scala_library",
-            "@io_bazel_rules_scala_scala_reflect",
-            "@org_scalameta_scalameta",
-            "@org_scala_lang_modules_scala_collection_compat",
+            "@org_scalameta_trees",
         ],
     },
     "org_scalameta_scalameta": {
-        "artifact": "org.scalameta:scalameta_2.11:4.3.0",
+        "artifact": "org.scalameta:scalameta_2.11:{}".format(scalameta_version),
         "sha256": "94fe739295447cd3ae877c279ccde1def06baea02d9c76a504dda23de1d90516",
         "deps": [
             "@io_bazel_rules_scala_scala_library",
@@ -135,7 +124,7 @@ artifacts = {
         ],
     },
     "org_scalameta_trees": {
-        "artifact": "org.scalameta:trees_2.11:4.3.0",
+        "artifact": "org.scalameta:trees_2.11:{}".format(scalameta_version),
         "sha256": "d24d5d63d8deafe646d455c822593a66adc6fdf17c8373754a3834a6e92a8a72",
         "deps": [
             "@com_thesamet_scalapb_scalapb_runtime",
@@ -144,6 +133,18 @@ artifacts = {
             "@org_scalameta_fastparse",
         ],
     },
+    "org_scalameta_scalafmt_core": {
+        "artifact": "org.scalameta:scalafmt-core_2.11:2.3.2",
+        "sha256": "6bf391e0e1d7369fda83ddaf7be4d267bf4cbccdf2cc31ff941999a78c30e67f",
+        "deps": [
+            "@com_geirsson_metaconfig_core",
+            "@com_geirsson_metaconfig_typesafe_config",
+            "@io_bazel_rules_scala_scala_library",
+            "@io_bazel_rules_scala_scala_reflect",
+            "@org_scalameta_scalameta",
+            "@org_scala_lang_modules_scala_collection_compat",
+        ],
+    },
     "org_typelevel_paiges_core": {
         "artifact": "org.typelevel:paiges-core_2.11:0.2.4",
         "sha256": "aa66fbe0457ca5cb5b9e522d4cb873623bb376a2e1ff58c464b5194c1d87c241",

diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl
@@ -1,4 +1,5 @@
 scala_version = "2.12.14"
+scalameta_version = "4.7.3"
 
 artifacts = {
     "io_bazel_rules_scala_scala_library": {
@@ -69,18 +70,6 @@ artifacts = {
         "artifact": "org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2",
         "sha256": "24985eb43e295a9dd77905ada307a850ca25acf819cdb579c093fc6987b0dbc2",
     },
-    "org_scalameta_common": {
-        "artifact": "org.scalameta:common_2.12:4.3.0",
-        "sha256": "3bdb2ff71d3e86f94b4d31d2c40442f533655860749a92fd17e1f29b8deb8baa",
-        "deps": [
-            "@com_lihaoyi_sourcecode",
-            "@io_bazel_rules_scala_scala_library",
-        ],
-    },
-    "org_scalameta_semanticdb_scalac": {
-        "artifact": "org.scalameta:semanticdb-scalac_2.12.14:4.7.3",
-        "sha256": "e5e31e1b48aedd3c7c2c2731d5053fd3429a3b37f076d95e8214acfa551c226a",
-    },
     "org_scalameta_fastparse": {
         "artifact": "org.scalameta:fastparse_2.12:1.0.1",
         "sha256": "387ced762e93915c5f87fed59d8453e404273f49f812d413405696ce20273aa5",
@@ -105,14 +94,6 @@ artifacts = {
             "@io_bazel_rules_scala_scala_library",
         ],
     },
-    "org_scalameta_parsers": {
-        "artifact": "org.scalameta:parsers_2.12:4.3.0",
-        "sha256": "d9f87d03b6b5e942f263db6dab75937493bfcb0fe7cfe2cda6567bf30f23ff3a",
-        "deps": [
-            "@io_bazel_rules_scala_scala_library",
-            "@org_scalameta_trees",
-        ],
-    },
     "org_scalameta_scalafmt_core": {
         "artifact": "org.scalameta:scalafmt-core_2.12:2.3.2",
         "sha256": "4788e2045e99f4624162d3182016a05032a7ab1324c4a28af433aa070f916773",
@@ -125,8 +106,28 @@ artifacts = {
             "@org_scala_lang_modules_scala_collection_compat",
         ],
     },
+    "org_scalameta_semanticdb_scalac": {
+        "artifact": "org.scalameta:semanticdb-scalac_{}:{}".format(scala_version, scalameta_version),
+        "sha256": "e5e31e1b48aedd3c7c2c2731d5053fd3429a3b37f076d95e8214acfa551c226a",
+    },
+    "org_scalameta_common": {
+        "artifact": "org.scalameta:common_2.12:{}".format(scalameta_version),
+        "sha256": "3bdb2ff71d3e86f94b4d31d2c40442f533655860749a92fd17e1f29b8deb8baa",
+        "deps": [
+            "@com_lihaoyi_sourcecode",
+            "@io_bazel_rules_scala_scala_library",
+        ],
+    },
+    "org_scalameta_parsers": {
+        "artifact": "org.scalameta:parsers_2.12:{}".format(scalameta_version),
+        "sha256": "d9f87d03b6b5e942f263db6dab75937493bfcb0fe7cfe2cda6567bf30f23ff3a",
+        "deps": [
+            "@io_bazel_rules_scala_scala_library",
+            "@org_scalameta_trees",
+        ],
+    },
     "org_scalameta_scalameta": {
-        "artifact": "org.scalameta:scalameta_2.12:4.3.0",
+        "artifact": "org.scalameta:scalameta_2.12:{}".format(scalameta_version),
         "sha256": "4d9487b434cbe9d89033824a4fc902dc7c782eea94961e8575df91ae96b10d6a",
         "deps": [
             "@io_bazel_rules_scala_scala_library",
@@ -135,7 +136,7 @@ artifacts = {
         ],
     },
     "org_scalameta_trees": {
-        "artifact": "org.scalameta:trees_2.12:4.3.0",
+        "artifact": "org.scalameta:trees_2.12:{}".format(scalameta_version),
         "sha256": "020b53681dd8e148d74ffa282276994bcb0f06c3425fb9a4bb9f8d161e22187a",
         "deps": [
             "@com_thesamet_scalapb_scalapb_runtime",

diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl
@@ -1,4 +1,5 @@
 scala_version = "2.13.6"
+scalameta_version = "4.7.3"
 
 artifacts = {
     "io_bazel_rules_scala_scala_library": {
@@ -73,18 +74,6 @@ artifacts = {
         "artifact": "org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2",
         "sha256": "5c285b72e6dc0a98e99ae0a1ceeb4027dab9adfa441844046bd3f19e0efdcb54",
     },
-    "org_scalameta_common": {
-        "artifact": "org.scalameta:common_2.13:4.3.24",
-        "sha256": "bb8ffbca69b42417aa5d3c73d4434b73dbbeb66748abc44a024090ff3aa38bd3",
-        "deps": [
-            "@com_lihaoyi_sourcecode",
-            "@io_bazel_rules_scala_scala_library",
-        ],
-    },
-    "org_scalameta_semanticdb_scalac": {
-        "artifact": "org.scalameta:semanticdb-scalac_2.13.6:4.7.3",
-        "sha256": "fbc7703b3ac407a4695d6055197cf9ea520260e0757dec488992b498a86ed656",
-    },
     "org_scalameta_fastparse": {
         "artifact": "org.scalameta:fastparse_2.13:1.0.1",
         "sha256": "b43b99244d5b51948daf1467083b3850dc2727c604de98dc426dec14244fd18e",
@@ -109,14 +98,6 @@ artifacts = {
             "@io_bazel_rules_scala_scala_library",
         ],
     },
-    "org_scalameta_parsers": {
-        "artifact": "org.scalameta:parsers_2.13:4.3.24",
-        "sha256": "5faebb22a064f38a4be19fdadb288dc771c1e362d0c4d2f46546f08e4f43c091",
-        "deps": [
-            "@io_bazel_rules_scala_scala_library",
-            "@org_scalameta_trees",
-        ],
-    },
     "org_scalameta_scalafmt_core": {
         "artifact": "org.scalameta:scalafmt-core_2.13:2.7.4",
         "sha256": "873d98275f75b67c1e01094a24bafb29a588b7d05fdc508d3b1ba02f08d0c0d8",
@@ -130,8 +111,28 @@ artifacts = {
             "@io_bazel_rules_scala_scala_parallel_collections",
         ],
     },
+    "org_scalameta_semanticdb_scalac": {
+        "artifact": "org.scalameta:semanticdb-scalac_{}:{}".format(scala_version, scalameta_version),
+        "sha256": "fbc7703b3ac407a4695d6055197cf9ea520260e0757dec488992b498a86ed656",
+    },
+    "org_scalameta_common": {
+        "artifact": "org.scalameta:common_2.13:{}".format(scalameta_version),
+        "sha256": "bb8ffbca69b42417aa5d3c73d4434b73dbbeb66748abc44a024090ff3aa38bd3",
+        "deps": [
+            "@com_lihaoyi_sourcecode",
+            "@io_bazel_rules_scala_scala_library",
+        ],
+    },
+    "org_scalameta_parsers": {
+        "artifact": "org.scalameta:parsers_2.13:{}".format(scalameta_version),
+        "sha256": "5faebb22a064f38a4be19fdadb288dc771c1e362d0c4d2f46546f08e4f43c091",
+        "deps": [
+            "@io_bazel_rules_scala_scala_library",
+            "@org_scalameta_trees",
+        ],
+    },
     "org_scalameta_scalameta": {
-        "artifact": "org.scalameta:scalameta_2.13:4.3.24",
+        "artifact": "org.scalameta:scalameta_2.13:{}".format(scalameta_version),
         "sha256": "d73eaf491eb588a2bd78aeba443e62bc95f1a368051d9e81607192c88fa4c61c",
         "deps": [
             "@io_bazel_rules_scala_scala_library",
@@ -140,7 +141,7 @@ artifacts = {
         ],
     },
     "org_scalameta_trees": {
-        "artifact": "org.scalameta:trees_2.13:4.3.24",
+        "artifact": "org.scalameta:trees_2.13:{}".format(scalameta_version),
         "sha256": "d49d2b085ae62e9317dd2a4e8b14be5b1ecbec2db392fa81cab86ad2bd7c2c68",
         "deps": [
             "@com_thesamet_scalapb_scalapb_runtime",