diff --git a/MODULE.bazel b/MODULE.bazel index 8520baa4..4b8e15b8 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -97,7 +97,7 @@ annex_scalafmt.install( artifacts = [ "org.scalameta:parsers_2.13:4.9.7", "org.scalameta:metaconfig-core_2.13:0.13.0", - "org.scalameta:scalafmt-core_2.13:3.9.7", + "org.scalameta:scalafmt-core_2.13:3.11.1", ], fetch_sources = True, lock_file = "//:annex_scalafmt_install.json", diff --git a/annex_scalafmt_install.json b/annex_scalafmt_install.json index 646291d2..631064d5 100644 --- a/annex_scalafmt_install.json +++ b/annex_scalafmt_install.json @@ -1,165 +1,179 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 946099427, - "__RESOLVED_ARTIFACTS_HASH": -533228911, + "__INPUT_ARTIFACTS_HASH": -564215888, + "__RESOLVED_ARTIFACTS_HASH": 209109433, "conflict_resolution": { - "org.scalameta:metaconfig-core_2.13:0.13.0": "org.scalameta:metaconfig-core_2.13:0.15.0", - "org.scalameta:parsers_2.13:4.9.7": "org.scalameta:parsers_2.13:4.13.6" + "org.scalameta:metaconfig-core_2.13:0.13.0": "org.scalameta:metaconfig-core_2.13:0.18.6", + "org.scalameta:parsers_2.13:4.9.7": "org.scalameta:parsers_2.13:4.17.0" }, "artifacts": { "com.lihaoyi:fansi_2.13": { "shasums": { - "jar": "fcae26580f7d6e72adbd6e5c504bb1715fbe3f5fb814d70e84bc5427a835e42c", - "sources": "90a5529c2000d0bbeaca1fa67d8139631a104ad770ea000e6e6e44b86b4f9697" + "jar": "e50796c69261fac857469122ab75f5aab4aeef855ca414f184cb132b318c2d9d", + "sources": "b28dc640b3b412023f605d29320adc89f50b0511d7e1376f9bbf9b1032a1de5d" }, - "version": "0.5.0" + "version": "0.5.1" }, "com.lihaoyi:sourcecode_2.13": { "shasums": { - "jar": "fbace2b994a7184f6b38ee98630be61f21948008a4a56cd83c7f86c1c1de743d", - "sources": "3cfacbe17cc04f57d7c397dce829f3b0e3faf282b421444aa7492099ad49cc2d" + "jar": "bd4e99aef8267a410b6ed716c487cf5256f801425f158a8c9cbd056eb032d80d", + "sources": "854238ec90912d0621ec068cddd8854a81f67242785b5e6fbe42f87c255641e9" }, - "version": "0.4.2" + "version": "0.4.4" }, "com.typesafe:config": { "shasums": { - "jar": "8ada4c185ce72416712d63e0b5afdc5f009c0cdf405e5f26efecdf156aa5dfb6", - "sources": "d3330505601cc47d97d03349d93dff32c85ec3881b5b168a8881c6af8ceb852a" + "jar": "dd6b9fb5da5bc49d31b581703f57050e1e7d403814f62f3832181a7226b36256", + "sources": "b942a9b75d56a4b5c2875089fa153a7ffc8583eee8d6c0dff0212352e8eba352" }, - "version": "1.4.3" + "version": "1.4.6" }, "io.github.java-diff-utils:java-diff-utils": { "shasums": { - "jar": "964c69e3a23a892db2778ae6806aa1d42f81230032bd8e4982dc8620582ee6b7", - "sources": "85e4ed33a7688be204d36d48a244cf815c05b54c626c6297ec4cf75be2af922f" + "jar": "620403030d676a4a27f780a3acec7438dee1b1651a1c804fa6bb11bb07399a6f", + "sources": "1307a36819f8dac34187402947e2a9e850b9e7ce95dd5044524e4860c3378ab0" }, - "version": "4.15" + "version": "4.16" }, "org.jline:jline": { "shasums": { - "jdk8": "9d165aff3d714a455de2e711dc90df09fdb0a0969a1cd4d52aa72a44cb545db0", - "sources": "6ca4d8eacb00f9c99a86732f99087ce1f8f2b94294651b042cb6fdcfbf73e136" + "jdk8": "ed2680487642df95379f220c09c0f77e25095713387e2bc00c2d6581bb79c804", + "sources": "659359eb04af6c42f4b9afe61abbe22a8e1945ad8f8fd0d9ce50504ae01a2c5d" }, - "version": "3.27.1" + "version": "3.29.0" }, "org.scala-lang.modules:scala-collection-compat_2.13": { "shasums": { - "jar": "40f141575b57796bf0c1e4b5f0974d91e3a6dee6ecea47ceed62c0efa1298234", - "sources": "76b9e86eb8f6cba0a93c271169bfa46b3e1c647477e39c68c9adc55c0a27ffc6" + "jar": "95986ac32df70c9ebdd96edfb276cdc038deedbe600177a45f6584022f34a13f", + "sources": "56672b16b5573d4c91e66ae6682ab3ef6d0ff4335ebffc4fdfe408bb4117b409" }, - "version": "2.13.0" + "version": "2.14.0" }, "org.scala-lang:scala-compiler": { "shasums": { - "jar": "f59982714591e321ba9c087af2c8666e2f5fb92b11a0cef72c2c5e9b342152d3", - "sources": "e922dc2f97d545fdc083f2fcf2915eb00c7647f3770b95489de0bc9ef7b54a3e" + "jar": "2f15891fcae7aad30a3892194fb2abb6224cf7ce5d2bd90fba7f1c48682fca21", + "sources": "08d9984b0e8c553bdfd7b5fa6aa8c1d2f2f1cd6904399b9a0ab8eba345ded335" }, - "version": "2.13.16" + "version": "2.13.18" }, "org.scala-lang:scala-library": { "shasums": { - "jar": "1ebb2b6f9e4eb4022497c19b1e1e825019c08514f962aaac197145f88ed730f1", - "sources": "c02edc324e7db59c52115214a6ef36e2d78d0a50dff635eda4dcee5502b1dea5" + "jar": "4e85d96ff7bc7dc627985523c3541b9917aaa08e956391380c42db21a2c4e5a0", + "sources": "bac5952705c53dce8a1a0ade4b6ca40900ac3421cd84dd6458ac683d768c3d18" }, - "version": "2.13.16" + "version": "2.13.18" }, "org.scala-lang:scala-reflect": { "shasums": { - "jar": "fb49ccd9cac7464486ab993cda20a3c1569d8ef26f052e897577ad2a4970fb1d", - "sources": "11c15fbf9ee203e262049fdd54d8b8472e1601970fba655678c237629815117e" + "jar": "6935ff1982b2ac93d695f15aa66921be2f602921277afe002f018fd8c7d6e29b", + "sources": "22c70ff11e4e38b9cc1bc3eb0131f3d4c3e46869f468c91829b97dc125d31fa1" + }, + "version": "2.13.18" + }, + "org.scalameta:common2_2.13": { + "shasums": { + "jar": "42a4fae02d82dc7450dddd69ce1d8b8f159119132898af56169f77b8c9a623bd", + "sources": "16329cf7cf8d19400fc2cdf6c9366bf69ebd69b53a784057dbba493f74a8b2f6" }, - "version": "2.13.16" + "version": "4.17.0" }, "org.scalameta:common_2.13": { "shasums": { - "jar": "a39a2021551b880702d0f56dd65702dbab45c0b262641ca4efc1925b93837d4f", - "sources": "f525477507eef239bedf45cdc57a13441bcc52cf0dce01498ff8848437fcb53b" + "jar": "3b5b1f67809daf6044113737af8aa4cc5c3b36f071950cfcf7d02f4fe6b1d19a", + "sources": "77d74285b5de41f6f82cc0244166f3e612a1b701653ccb7b2d63e2e112e20734" }, - "version": "4.13.6" + "version": "4.17.0" }, "org.scalameta:io_2.13": { "shasums": { - "jar": "3da45d9e4144f22a474590383909c5d5140ca2f1d2f7655ac132fcb73a9a9ac9", - "sources": "9922701148889896e00ff04e54dc4b27049f5c1b211c4438f2f4f340e9168ed8" + "jar": "d09dac9887efb0aaf7bbcc5b5e20f7e7e4947800592a44359e2f31b2b6c9699d", + "sources": "3b454bfe909c12ec685f10f4c2d6677d60813ed1718092777aeab7195b07f831" }, - "version": "4.13.6" + "version": "4.17.0" }, "org.scalameta:mdoc-parser_2.13": { "shasums": { - "jar": "d1462cf777c227a9a751ae9aae3cb7ab7c3fc1f70689f35eafe58746e33566cc", - "sources": "75f10d53ccb7459087b8c966aab3d7eb85988f706396839948d7610c03e2feab" + "jar": "37442a255f0e6a31c9786d7d8af4ef1e29ded76c4f44af29895b4b36d904a068", + "sources": "6ae514122c8f5e3784a01c8eff145df881cbe3611039c5b1c9a06e214556bab0" }, - "version": "2.6.4" + "version": "2.9.0" }, "org.scalameta:metaconfig-core_2.13": { "shasums": { - "jar": "c0b789c2d4468238fc325ef0a17f1a029b3635ff12b510bde03dd577a1281278", - "sources": "2b7d19eeef271242082938ff385ba5ff67cff8d4f27931da5428382daab415c3" + "jar": "f8ed537b95758409a0dd0a9533fdd6da703914f5901f42d6f96ba07c77f58aaf", + "sources": "ec4d263f50bec3dfca9892be81cbbaf2ae0873f1203dee7b407d83a2bdc75390" }, - "version": "0.15.0" + "version": "0.18.6" }, "org.scalameta:metaconfig-pprint_2.13": { "shasums": { - "jar": "357e65682c00db62978f0dd21fea01f13a5f0fb31b45308ad74b136b1ec4f021", - "sources": "948a8e8125c4a492b19c1ccfc15f8b47652de01b0169210892913a64601e00c0" + "jar": "cbe1531b67e0c080294e3eaeea35952524c91af0c100f517ba7004607f44be46", + "sources": "fd77db8ba276cbe658c18e99a42eeee9ea2574bef8206df4ee60a657093ddd59" }, - "version": "0.15.0" + "version": "0.18.6" }, "org.scalameta:metaconfig-typesafe-config_2.13": { "shasums": { - "jar": "2ae5a8ecba43fb809696e419f1f98739e419534cc25918e2d8949a2d2727327e", - "sources": "bdcae524648e8207dae36bc08c667d5a479bd18a5ab2f8bf7df9d128a258c55a" + "jar": "1ddbdfcc9f425ca385fa0e0079b8f6fc12571b2e03c9a3ae2bc0c832ca288bca", + "sources": "b59f4a7a92ff0f88ceb6afcb22f0725590380bd61389bd695479bcc4c4ff7762" }, - "version": "0.15.0" + "version": "0.18.6" }, "org.scalameta:parsers_2.13": { "shasums": { - "jar": "83f758ffd1a69877ee239fca279526ee251c7315474683f11a58d19279b4469c", - "sources": "2bfd3ea99d78a772269cbe6c1e065cc77d1dc6c68b72d00ea6faed14c952487e" + "jar": "c0669f252bf96db52ac32c92bf54f2853b8f192287a827626c3efe51b20f94b3", + "sources": "c92d5e1f05e0d806da22e386cae35ffc0e511c404c2f99f9a82a2af481693b26" }, - "version": "4.13.6" + "version": "4.17.0" }, "org.scalameta:scalafmt-config_2.13": { "shasums": { - "jar": "a54e832b7d73345affc071dceb98f3d68ec090da1088f779977299bbd702fdd2", - "sources": "fb811acf23d227522b1e98c2537002aa3aed212e2ee731b1a26598847f03c606" + "jar": "c058aefc9f874c78072fca15a25e72a4d3ab31bc2872266c42cc6e2651f6cbf1", + "sources": "49eac6dc041fb42e8b589fe0d8ce6f0b2f53e6c669528bc5d91dd14f6b0b657c" }, - "version": "3.9.7" + "version": "3.11.1" }, "org.scalameta:scalafmt-core_2.13": { "shasums": { - "jar": "7735f8deaa6c9a5cb4d45b23513fe6d33cb5f8a1988d4380b769d3cf12819fc6", - "sources": "6b3e9cdcbe5dd2ce902553593dea28104a0e6bac381961c5b009a05e95c94baf" + "jar": "f5f0e48927f0d5a32763f6b82a8427b40231db65a908c48b4438b000562c32d2", + "sources": "568be6f080b2fa5a845f39f93280d1bcc7e7d4995b1e0e79ce4f60af82650a99" }, - "version": "3.9.7" + "version": "3.11.1" }, "org.scalameta:scalafmt-macros_2.13": { "shasums": { - "jar": "e57120f3fb4ee09366f6fc668475c3f7fbc1f53e45074f4eb6930890f15e94c8", - "sources": "5ba8e3519ed164ccdc3d16f502dbaf0d010f77f2f56899d0ef53f674ddfa7fac" + "jar": "49a4ab5745cc0b54acdb74b3fd6017451d5699d5d327ca1bea0747bc622edc9f", + "sources": "daadd10337f664246808221a59e58d48bd8a3841b34554b2a01c9decbf88cccf" }, - "version": "3.9.7" + "version": "3.11.1" }, "org.scalameta:scalafmt-sysops_2.13": { "shasums": { - "jar": "b6fe155257e66fb1bfad5f8cca35c50c8aad03f933fb49d8eea97516af555d60", - "sources": "6dae2e68ee677947757e76eba24d039e2c4b38c2e8162bf63c2dad8020e63e93" + "jar": "a862c2bd21ba6b83d403a8aca33af541de356f7d39e88c1656bd2cf6a3b28a80", + "sources": "125e7ff1cf601a09bfc07e8b44326ee3c6f8ca3a4efe75882cbe3308eb2f07fb" }, - "version": "3.9.7" + "version": "3.11.1" }, "org.scalameta:scalameta_2.13": { "shasums": { - "jar": "1c9d98b9f6604238bee4357ca618482f435d61fcbed7708f30c8c3b9eb094503", - "sources": "47b699e20a873cb90dc97c17ad701d7366b6ad938ca0bfca797c2a320223e95f" + "jar": "7606f691512cac7e52e1c28146cc95001212aeb3737b44d5ea6f4ec51b9a454c", + "sources": "bf4d7288b64c1b1b6e52209bea9f5b4b03a837018f8a00cad77ba9f2a496678b" }, - "version": "4.13.6" + "version": "4.17.0" + }, + "org.scalameta:trees2_2.13": { + "shasums": { + "jar": "c1ad0ac4c5617ee25ad97b72fb2d03c48d5ee89770e7cc70b0e3e984689296ce", + "sources": "a5c2394d894d7051eebbf4c101be839ac4dd43f61c79a9d30244a8c6d08a0074" + }, + "version": "4.17.0" }, "org.scalameta:trees_2.13": { "shasums": { - "jar": "5d8ffacf8da4e64d2ef451fcb4671d8dce12551722b189efd4b1f7b6fb0e4015", - "sources": "0cb90c0c9acec39ae63672c441277b86dceed90187c53d72910bd8bc01279f47" + "jar": "b45d46d995e166889cbda015f541ca79afd94ada860513438e6c0ab5f4f84591", + "sources": "7fb8f84bdaf41249a09425f09354a7ef6f9dcc3d7ad93ae447b67966615dbe19" }, - "version": "4.13.6" + "version": "4.17.0" }, "org.typelevel:paiges-core_2.13": { "shasums": { @@ -189,9 +203,13 @@ "org.scala-lang:scala-reflect": [ "org.scala-lang:scala-library" ], + "org.scalameta:common2_2.13": [ + "org.scala-lang:scala-library" + ], "org.scalameta:common_2.13": [ "com.lihaoyi:sourcecode_2.13", - "org.scala-lang:scala-library" + "org.scala-lang:scala-library", + "org.scalameta:common2_2.13" ], "org.scalameta:io_2.13": [ "org.scala-lang:scala-library" @@ -231,7 +249,8 @@ "org.scalameta:mdoc-parser_2.13", "org.scalameta:scalafmt-config_2.13", "org.scalameta:scalafmt-macros_2.13", - "org.scalameta:scalafmt-sysops_2.13" + "org.scalameta:scalafmt-sysops_2.13", + "org.scalameta:scalameta_2.13" ], "org.scalameta:scalafmt-macros_2.13": [ "org.scala-lang:scala-library", @@ -245,10 +264,16 @@ "org.scala-lang:scala-library", "org.scalameta:parsers_2.13" ], + "org.scalameta:trees2_2.13": [ + "org.scala-lang:scala-library", + "org.scalameta:common2_2.13", + "org.scalameta:io_2.13" + ], "org.scalameta:trees_2.13": [ "org.scala-lang:scala-library", "org.scalameta:common_2.13", - "org.scalameta:io_2.13" + "org.scalameta:io_2.13", + "org.scalameta:trees2_2.13" ], "org.typelevel:paiges-core_2.13": [ "org.scala-lang:scala-library" @@ -272,6 +297,7 @@ "com.github.difflib.algorithm.myers", "com.github.difflib.patch", "com.github.difflib.text", + "com.github.difflib.text.deltamerge", "com.github.difflib.unifieddiff" ], "org.jline:jline:jar:jdk8": [ @@ -326,6 +352,7 @@ "com.github.difflib.algorithm.myers", "com.github.difflib.patch", "com.github.difflib.text", + "com.github.difflib.text.deltamerge", "com.github.difflib.unifieddiff", "scala.reflect.macros.compiler", "scala.reflect.macros.contexts", @@ -435,16 +462,16 @@ "scala.reflect.macros.whitebox", "scala.reflect.runtime" ], - "org.scalameta:common_2.13": [ + "org.scalameta:common2_2.13": [ "org.scalameta", "org.scalameta.adt", - "org.scalameta.collections", "org.scalameta.data", "org.scalameta.explore", "org.scalameta.internal", "org.scalameta.invariants", "org.scalameta.overload", "org.scalameta.tests", + "scala.meta", "scala.meta.classifiers", "scala.meta.common", "scala.meta.internal", @@ -456,6 +483,11 @@ "scala.meta.internal.trees", "scala.meta.prettyprinters" ], + "org.scalameta:common_2.13": [ + "buildinfo", + "org.scalameta", + "org.scalameta.collections" + ], "org.scalameta:io_2.13": [ "scala.meta.internal.io", "scala.meta.io" @@ -508,26 +540,29 @@ "scala.meta.contrib.implicits", "scala.meta.contrib.instances" ], - "org.scalameta:trees_2.13": [ + "org.scalameta:trees2_2.13": [ "scala.meta", - "scala.meta.contrib", "scala.meta.dialects", "scala.meta.inputs", - "scala.meta.internal", "scala.meta.internal.dialects", "scala.meta.internal.inputs", - "scala.meta.internal.parsers", "scala.meta.internal.prettyprinters", "scala.meta.internal.tokenizers", "scala.meta.internal.tokens", "scala.meta.internal.trees", - "scala.meta.shaded.internal.fastparse", - "scala.meta.shaded.internal.fastparse.internal", - "scala.meta.shaded.internal.geny", "scala.meta.tokenizers", "scala.meta.tokens", "scala.meta.trees" ], + "org.scalameta:trees_2.13": [ + "scala.meta.internal", + "scala.meta.internal.parsers", + "scala.meta.internal.tokenizers", + "scala.meta.internal.trees", + "scala.meta.shaded.internal.fastparse", + "scala.meta.shaded.internal.fastparse.internal", + "scala.meta.shaded.internal.geny" + ], "org.typelevel:paiges-core_2.13": [ "org.typelevel.paiges" ] @@ -552,6 +587,8 @@ "org.scala-lang:scala-library:jar:sources", "org.scala-lang:scala-reflect", "org.scala-lang:scala-reflect:jar:sources", + "org.scalameta:common2_2.13", + "org.scalameta:common2_2.13:jar:sources", "org.scalameta:common_2.13", "org.scalameta:common_2.13:jar:sources", "org.scalameta:io_2.13", @@ -576,6 +613,8 @@ "org.scalameta:scalafmt-sysops_2.13:jar:sources", "org.scalameta:scalameta_2.13", "org.scalameta:scalameta_2.13:jar:sources", + "org.scalameta:trees2_2.13", + "org.scalameta:trees2_2.13:jar:sources", "org.scalameta:trees_2.13", "org.scalameta:trees_2.13:jar:sources", "org.typelevel:paiges-core_2.13", @@ -600,6 +639,8 @@ "org.scala-lang:scala-library:jar:sources", "org.scala-lang:scala-reflect", "org.scala-lang:scala-reflect:jar:sources", + "org.scalameta:common2_2.13", + "org.scalameta:common2_2.13:jar:sources", "org.scalameta:common_2.13", "org.scalameta:common_2.13:jar:sources", "org.scalameta:io_2.13", @@ -624,6 +665,8 @@ "org.scalameta:scalafmt-sysops_2.13:jar:sources", "org.scalameta:scalameta_2.13", "org.scalameta:scalameta_2.13:jar:sources", + "org.scalameta:trees2_2.13", + "org.scalameta:trees2_2.13:jar:sources", "org.scalameta:trees_2.13", "org.scalameta:trees_2.13:jar:sources", "org.typelevel:paiges-core_2.13", @@ -648,6 +691,8 @@ "org.scala-lang:scala-library:jar:sources", "org.scala-lang:scala-reflect", "org.scala-lang:scala-reflect:jar:sources", + "org.scalameta:common2_2.13", + "org.scalameta:common2_2.13:jar:sources", "org.scalameta:common_2.13", "org.scalameta:common_2.13:jar:sources", "org.scalameta:io_2.13", @@ -672,6 +717,8 @@ "org.scalameta:scalafmt-sysops_2.13:jar:sources", "org.scalameta:scalameta_2.13", "org.scalameta:scalameta_2.13:jar:sources", + "org.scalameta:trees2_2.13", + "org.scalameta:trees2_2.13:jar:sources", "org.scalameta:trees_2.13", "org.scalameta:trees_2.13:jar:sources", "org.typelevel:paiges-core_2.13", @@ -730,6 +777,16 @@ "javax.script.ScriptEngineFactory": [ "scala.tools.nsc.interpreter.shell.Scripted$Factory" ] + }, + "org.scalameta:trees_2.13": { + "scala.meta.tokenizers.Tokenize": [ + "scala.meta.internal.tokenizers.ScalametaTokenizer$AsTokenize$" + ] + }, + "org.scalameta:trees_2.13:jar:sources": { + "scala.meta.tokenizers.Tokenize": [ + "scala.meta.internal.tokenizers.ScalametaTokenizer$AsTokenize$" + ] } }, "version": "2"