diff --git a/README.md b/README.md index 7f2acf13..a19717c8 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ protobuf_deps() # 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_13_14", + actual = "@rules_scala_annex//src/main/scala:zinc_2_13", ) ``` diff --git a/WORKSPACE b/WORKSPACE index 135caaea..87b56e5a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -112,7 +112,7 @@ load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") rules_jvm_external_setup() -# Scala +# Scala 2_13 and 3 load("//rules/scala:workspace.bzl", "scala_register_toolchains", "scala_repositories") scala_repositories() @@ -133,16 +133,6 @@ load("@annex_2_12//:defs.bzl", annex_2_12_pinned_maven_install = "pinned_maven_i annex_2_12_pinned_maven_install() -# Scala 3 - -load("//rules/scala:workspace_3.bzl", "scala_3_repositories") - -scala_3_repositories() - -load("@annex_3//:defs.bzl", annex_3_pinned_maven_install = "pinned_maven_install") - -annex_3_pinned_maven_install() - # Scala fmt load("//rules/scalafmt:workspace.bzl", "scalafmt_default_config", "scalafmt_repositories") diff --git a/annex_install.json b/annex_install.json index 05314822..0bbcffb5 100644 --- a/annex_install.json +++ b/annex_install.json @@ -1,8 +1,8 @@ { "dependency_tree": { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1383329296, - "__RESOLVED_ARTIFACTS_HASH": 1567561523, + "__INPUT_ARTIFACTS_HASH": -1048787775, + "__RESOLVED_ARTIFACTS_HASH": -59561227, "conflict_resolution": {}, "dependencies": [ { @@ -4287,41 +4287,76 @@ "url": "https://repo.maven.apache.org/maven2/org/jctools/jctools-core/2.0.1/jctools-core-2.0.1-sources.jar" }, { - "coord": "org.jline:jline-native:3.24.1", + "coord": "org.jline:jline-native:3.25.1", "dependencies": [], "directDependencies": [], - "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1.jar", + "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1.jar", "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1.jar" + "https://repo.maven.apache.org/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1.jar" ], - "sha256": "4337237502d3b647b981b007e14e75d79ec51497f52e9871baf6e2c6c9dfbd17", - "url": "https://repo.maven.apache.org/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1.jar" + "sha256": "42d5bbe1f546dea248b8c901da7deb9943f76290379552923c9763495bb9f172", + "url": "https://repo.maven.apache.org/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1.jar" }, { - "coord": "org.jline:jline-native:jar:sources:3.24.1", + "coord": "org.jline:jline-native:jar:sources:3.25.1", "dependencies": [], "directDependencies": [], - "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1-sources.jar", + "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1-sources.jar", "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1-sources.jar" + "https://repo.maven.apache.org/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1-sources.jar" ], - "sha256": "32f10b4233f529e9741650f7d652be92d07e8d2278b5af3fc4a19b460fabcc14", - "url": "https://repo.maven.apache.org/maven2/org/jline/jline-native/3.24.1/jline-native-3.24.1-sources.jar" + "sha256": "a3026f0bfe678502ac7f37dba48563d18f1640d585c164f921adbe01fa3152fb", + "url": "https://repo.maven.apache.org/maven2/org/jline/jline-native/3.25.1/jline-native-3.25.1-sources.jar" + }, + { + "coord": "org.jline:jline-reader:3.25.1", + "dependencies": [ + "org.jline:jline-terminal:3.25.1", + "org.jline:jline-native:3.25.1" + ], + "directDependencies": [ + "org.jline:jline-terminal:3.25.1" + ], + "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1.jar" + ], + "sha256": "26333a275de502adf1dd9e6ea50aa0b4021412c71490df9ed5e88a648886ee89", + "url": "https://repo.maven.apache.org/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1.jar" + }, + { + "coord": "org.jline:jline-reader:jar:sources:3.25.1", + "dependencies": [ + "org.jline:jline-terminal:jar:sources:3.25.1", + "org.jline:jline-native:jar:sources:3.25.1" + ], + "directDependencies": [ + "org.jline:jline-terminal:jar:sources:3.25.1" + ], + "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1-sources.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1-sources.jar" + ], + "sha256": "b5164bad15bb8d29566566b12cf4be95b252e18d3056ef96e70b934dbc3872cd", + "url": "https://repo.maven.apache.org/maven2/org/jline/jline-reader/3.25.1/jline-reader-3.25.1-sources.jar" }, { "coord": "org.jline:jline-terminal-jansi:3.24.1", "dependencies": [ - "org.jline:jline-terminal:3.24.1", - "org.jline:jline-native:3.24.1", + "org.jline:jline-terminal:3.25.1", "org.fusesource.jansi:jansi:2.4.1" ], "directDependencies": [ "org.fusesource.jansi:jansi:2.4.1", - "org.jline:jline-terminal:3.24.1" + "org.jline:jline-terminal:3.25.1" ], "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal-jansi/3.24.1/jline-terminal-jansi-3.24.1.jar", "mirror_urls": [ @@ -4336,12 +4371,11 @@ "coord": "org.jline:jline-terminal-jansi:jar:sources:3.24.1", "dependencies": [ "org.fusesource.jansi:jansi:jar:sources:2.4.1", - "org.jline:jline-terminal:jar:sources:3.24.1", - "org.jline:jline-native:jar:sources:3.24.1" + "org.jline:jline-terminal:jar:sources:3.25.1" ], "directDependencies": [ "org.fusesource.jansi:jansi:jar:sources:2.4.1", - "org.jline:jline-terminal:jar:sources:3.24.1" + "org.jline:jline-terminal:jar:sources:3.25.1" ], "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal-jansi/3.24.1/jline-terminal-jansi-3.24.1-sources.jar", "mirror_urls": [ @@ -4353,78 +4387,78 @@ "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jansi/3.24.1/jline-terminal-jansi-3.24.1-sources.jar" }, { - "coord": "org.jline:jline-terminal-jna:3.24.1", + "coord": "org.jline:jline-terminal-jna:3.25.1", "dependencies": [ - "org.jline:jline-terminal:3.24.1", - "org.jline:jline-native:3.24.1", + "org.jline:jline-terminal:3.25.1", + "org.jline:jline-native:3.25.1", "net.java.dev.jna:jna:5.14.0" ], "directDependencies": [ "net.java.dev.jna:jna:5.14.0", - "org.jline:jline-terminal:3.24.1" + "org.jline:jline-terminal:3.25.1" ], - "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1.jar", + "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1.jar", "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1.jar" + "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1.jar" ], - "sha256": "ec59d38160b0faa720472ff3f168564d22af4d991316ba30bffe2c163ae4040c", - "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1.jar" + "sha256": "58ca9d719c373206af15775ee3cd5f268136ea0d0c4e009c3e96a6d4612d5c66", + "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1.jar" }, { - "coord": "org.jline:jline-terminal-jna:jar:sources:3.24.1", + "coord": "org.jline:jline-terminal-jna:jar:sources:3.25.1", "dependencies": [ - "org.jline:jline-terminal:jar:sources:3.24.1", - "org.jline:jline-native:jar:sources:3.24.1", + "org.jline:jline-terminal:jar:sources:3.25.1", + "org.jline:jline-native:jar:sources:3.25.1", "net.java.dev.jna:jna:jar:sources:5.14.0" ], "directDependencies": [ "net.java.dev.jna:jna:jar:sources:5.14.0", - "org.jline:jline-terminal:jar:sources:3.24.1" + "org.jline:jline-terminal:jar:sources:3.25.1" ], - "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1-sources.jar", + "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1-sources.jar", "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1-sources.jar" + "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1-sources.jar" ], - "sha256": "d83c3350fbd261f6540d9557585cde1d1395b23922173f9898ecb6aefcd054ca", - "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.24.1/jline-terminal-jna-3.24.1-sources.jar" + "sha256": "fe03ffce7be95b6e1aa7e46ddc65b57c4fa4931b04ed65f64e590043c6eabfc5", + "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal-jna/3.25.1/jline-terminal-jna-3.25.1-sources.jar" }, { - "coord": "org.jline:jline-terminal:3.24.1", + "coord": "org.jline:jline-terminal:3.25.1", "dependencies": [ - "org.jline:jline-native:3.24.1" + "org.jline:jline-native:3.25.1" ], "directDependencies": [ - "org.jline:jline-native:3.24.1" + "org.jline:jline-native:3.25.1" ], - "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1.jar", + "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1.jar", "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1.jar" + "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1.jar" ], - "sha256": "d9e32b47e134718eec9adcfaebf838130a163999ced820fc32795d4420f159e2", - "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1.jar" + "sha256": "c0f5d70901255da66a94e59778b265d19f9308342578e34c88fc92d1b0c65fef", + "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1.jar" }, { - "coord": "org.jline:jline-terminal:jar:sources:3.24.1", + "coord": "org.jline:jline-terminal:jar:sources:3.25.1", "dependencies": [ - "org.jline:jline-native:jar:sources:3.24.1" + "org.jline:jline-native:jar:sources:3.25.1" ], "directDependencies": [ - "org.jline:jline-native:jar:sources:3.24.1" + "org.jline:jline-native:jar:sources:3.25.1" ], - "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1-sources.jar", + "file": "v1/https/repo.maven.apache.org/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1-sources.jar", "mirror_urls": [ - "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1-sources.jar", - "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1-sources.jar", - "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1-sources.jar" + "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1-sources.jar" ], - "sha256": "bd361fd088ec3b0bbbbab3744c73689129278d368949aa6606a5f5a60314ef87", - "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.24.1/jline-terminal-3.24.1-sources.jar" + "sha256": "bee7c4d6b7c19365719d56f380c0fe96e0ddc584fa059104afe919e5b3be1d90", + "url": "https://repo.maven.apache.org/maven2/org/jline/jline-terminal/3.25.1/jline-terminal-3.25.1-sources.jar" }, { "coord": "org.jline:jline:3.25.1", @@ -4504,6 +4538,32 @@ "sha256": "7e673b0c8b0ac51bdef8655cacf7804fb9791c47e71161a36c94738d55eefea8", "url": "https://repo.maven.apache.org/maven2/org/reactivestreams/reactive-streams/1.0.0/reactive-streams-1.0.0-sources.jar" }, + { + "coord": "org.scala-lang.modules:scala-asm:9.6.0-scala-1", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1.jar" + ], + "sha256": "bf16f8b69e89cadab550bce266a052780af7f1eb29dd1c04c3bd014113752c12", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1.jar" + }, + { + "coord": "org.scala-lang.modules:scala-asm:jar:sources:9.6.0-scala-1", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1-sources.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1-sources.jar" + ], + "sha256": "6a58718b53a6bd8f1b1e22b2bf7ef9b88eccbbe5e0fc223847b0343100d4a45a", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/modules/scala-asm/9.6.0-scala-1/scala-asm-9.6.0-scala-1-sources.jar" + }, { "coord": "org.scala-lang.modules:scala-collection-compat_2.13:2.12.0", "dependencies": [ @@ -4818,6 +4878,196 @@ "sha256": "94bf451e612d9460dbc7cee4beed84a7e5dd7b86bcb901ee8c78f7cf5e035e01", "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala-reflect/2.13.14/scala-reflect-2.13.14-sources.jar" }, + { + "coord": "org.scala-lang:scala3-compiler_3:3.4.2", + "dependencies": [ + "org.jline:jline-terminal-jna:3.25.1", + "org.scala-lang:scala3-interfaces:3.4.2", + "net.java.dev.jna:jna:5.14.0", + "org.jline:jline-terminal:3.25.1", + "org.scala-lang:scala3-library_3:3.4.2", + "org.scala-sbt:compiler-interface:1.10.0", + "org.scala-lang.modules:scala-asm:9.6.0-scala-1", + "org.jline:jline-native:3.25.1", + "org.scala-lang:tasty-core_3:3.4.2", + "org.jline:jline-reader:3.25.1", + "org.scala-lang:scala-library:2.13.14" + ], + "directDependencies": [ + "org.jline:jline-terminal-jna:3.25.1", + "org.scala-lang:scala3-interfaces:3.4.2", + "org.jline:jline-terminal:3.25.1", + "org.scala-lang:scala3-library_3:3.4.2", + "org.scala-sbt:compiler-interface:1.10.0", + "org.scala-lang.modules:scala-asm:9.6.0-scala-1", + "org.scala-lang:tasty-core_3:3.4.2", + "org.jline:jline-reader:3.25.1" + ], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2.jar" + ], + "sha256": "c50f6089b1d55b0b7f9fbb2ef9d69f966b07c734d9b96e2b45b5b41b2d1bdd45", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2.jar" + }, + { + "coord": "org.scala-lang:scala3-compiler_3:jar:sources:3.4.2", + "dependencies": [ + "org.scala-lang:tasty-core_3:jar:sources:3.4.2", + "org.scala-lang:scala3-library_3:jar:sources:3.4.2", + "org.scala-lang.modules:scala-asm:jar:sources:9.6.0-scala-1", + "org.scala-lang:scala-library:jar:sources:2.13.14", + "org.scala-lang:scala3-interfaces:jar:sources:3.4.2", + "org.jline:jline-terminal:jar:sources:3.25.1", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", + "org.jline:jline-native:jar:sources:3.25.1", + "net.java.dev.jna:jna:jar:sources:5.14.0", + "org.jline:jline-reader:jar:sources:3.25.1", + "org.scala-sbt:compiler-interface:jar:sources:1.10.0" + ], + "directDependencies": [ + "org.scala-lang:tasty-core_3:jar:sources:3.4.2", + "org.scala-lang:scala3-library_3:jar:sources:3.4.2", + "org.scala-lang.modules:scala-asm:jar:sources:9.6.0-scala-1", + "org.scala-lang:scala3-interfaces:jar:sources:3.4.2", + "org.jline:jline-terminal:jar:sources:3.25.1", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", + "org.jline:jline-reader:jar:sources:3.25.1", + "org.scala-sbt:compiler-interface:jar:sources:1.10.0" + ], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2-sources.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2-sources.jar" + ], + "sha256": "e887ce463f9fe65b732bc26af1462b8ab7097e8dfbc582ca89823a8cc5bf383e", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-compiler_3/3.4.2/scala3-compiler_3-3.4.2-sources.jar" + }, + { + "coord": "org.scala-lang:scala3-interfaces:3.4.2", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2.jar" + ], + "sha256": "3907de290b0e38070f5b5e5598d08d5f302ad0ef9014f7a690ca8e90946ddda3", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2.jar" + }, + { + "coord": "org.scala-lang:scala3-interfaces:jar:sources:3.4.2", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2-sources.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2-sources.jar" + ], + "sha256": "d0bc8086b14a247ed50f56c6e09f9563b907b10a7b2d90b493eed5eb7a5df1c4", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-interfaces/3.4.2/scala3-interfaces-3.4.2-sources.jar" + }, + { + "coord": "org.scala-lang:scala3-library_3:3.4.2", + "dependencies": [ + "org.scala-lang:scala-library:2.13.14" + ], + "directDependencies": [ + "org.scala-lang:scala-library:2.13.14" + ], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2.jar" + ], + "sha256": "5d8a8535e11d9dc52400cca0bc1d0edfe9385f15af5710c454ce8ab0e62783a0", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2.jar" + }, + { + "coord": "org.scala-lang:scala3-library_3:jar:sources:3.4.2", + "dependencies": [ + "org.scala-lang:scala-library:jar:sources:2.13.14" + ], + "directDependencies": [ + "org.scala-lang:scala-library:jar:sources:2.13.14" + ], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2-sources.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2-sources.jar" + ], + "sha256": "9780c029947dfb9d8473d9e184185d83e11fe3a7da4578d937decd56b8818987", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-library_3/3.4.2/scala3-library_3-3.4.2-sources.jar" + }, + { + "coord": "org.scala-lang:scala3-sbt-bridge:3.4.2", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2.jar" + ], + "sha256": "76ae65d99f14e131bd271ac22f805fbb8a39338a95e3fb38fd480fbca01964fe", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2.jar" + }, + { + "coord": "org.scala-lang:scala3-sbt-bridge:jar:sources:3.4.2", + "dependencies": [], + "directDependencies": [], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2-sources.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2-sources.jar" + ], + "sha256": "32e4085415e70046fb70b9e05492dc551ea32e47d2df1890611298f91bacec5e", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/scala3-sbt-bridge/3.4.2/scala3-sbt-bridge-3.4.2-sources.jar" + }, + { + "coord": "org.scala-lang:tasty-core_3:3.4.2", + "dependencies": [ + "org.scala-lang:scala-library:2.13.14", + "org.scala-lang:scala3-library_3:3.4.2" + ], + "directDependencies": [ + "org.scala-lang:scala3-library_3:3.4.2" + ], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2.jar" + ], + "sha256": "3697f3a858c594c5022f2f7751504c069a384b92b4e093e9742bbaa627e0c10f", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2.jar" + }, + { + "coord": "org.scala-lang:tasty-core_3:jar:sources:3.4.2", + "dependencies": [ + "org.scala-lang:scala-library:jar:sources:2.13.14", + "org.scala-lang:scala3-library_3:jar:sources:3.4.2" + ], + "directDependencies": [ + "org.scala-lang:scala3-library_3:jar:sources:3.4.2" + ], + "file": "v1/https/repo.maven.apache.org/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2-sources.jar", + "mirror_urls": [ + "https://repo.maven.apache.org/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2-sources.jar", + "https://maven-central.storage-download.googleapis.com/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2-sources.jar" + ], + "sha256": "24541ecf51853f3226acd3bfa9a3deaf4d3604fc19f1a1945febcc73f82ca800", + "url": "https://repo.maven.apache.org/maven2/org/scala-lang/tasty-core_3/3.4.2/tasty-core_3-3.4.2-sources.jar" + }, { "coord": "org.scala-sbt.ivy:ivy:2.3.0-sbt-a3314352b638afbf0dca19f127e8263ed6f898bd", "dependencies": [], @@ -5740,17 +5990,17 @@ "org.scala-lang:scala-reflect:2.13.14", "com.lmax:disruptor:3.4.2", "org.scala-sbt:util-interface:1.10.0", - "org.jline:jline-terminal:3.24.1", + "org.jline:jline-terminal-jna:3.25.1", "org.fusesource.jansi:jansi:2.4.1", "net.java.dev.jna:jna:5.14.0", "com.swoval:file-tree-views:2.1.12", + "org.jline:jline-terminal:3.25.1", "org.scala-sbt:core-macros_2.13:1.10.0", "org.jline:jline-terminal-jansi:3.24.1", "org.scala-sbt:collections_2.13:1.10.0", "org.apache.logging.log4j:log4j-api:2.17.1", "com.eed3si9n:sjson-new-scalajson_2.13:0.9.1", "com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4", - "org.jline:jline-native:3.24.1", "org.scala-lang:scala-compiler:2.13.14", "net.java.dev.jna:jna-platform:5.13.0", "org.scala-sbt.jline:jline:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", @@ -5759,7 +6009,6 @@ "org.scala-lang:scala-library:2.13.14", "org.apache.logging.log4j:log4j-core:2.17.1", "org.scala-sbt:io_2.13:1.10.0", - "org.jline:jline-terminal-jna:3.24.1", "com.eed3si9n:shaded-jawn-parser_2.13:0.9.1", "org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0" ], @@ -5767,7 +6016,8 @@ "org.scala-lang:scala-reflect:2.13.14", "com.lmax:disruptor:3.4.2", "org.scala-sbt:util-interface:1.10.0", - "org.jline:jline-terminal:3.24.1", + "org.jline:jline-terminal-jna:3.25.1", + "org.jline:jline-terminal:3.25.1", "org.scala-sbt:core-macros_2.13:1.10.0", "org.jline:jline-terminal-jansi:3.24.1", "org.scala-sbt:collections_2.13:1.10.0", @@ -5777,8 +6027,7 @@ "com.eed3si9n:sjson-new-core_2.13:0.9.1", "org.scala-lang:scala-library:2.13.14", "org.apache.logging.log4j:log4j-core:2.17.1", - "org.scala-sbt:io_2.13:1.10.0", - "org.jline:jline-terminal-jna:3.24.1" + "org.scala-sbt:io_2.13:1.10.0" ], "file": "v1/https/repo.maven.apache.org/maven2/org/scala-sbt/util-logging_2.13/1.10.0/util-logging_2.13-1.10.0.jar", "mirror_urls": [ @@ -5798,14 +6047,13 @@ "org.scala-lang:scala-library:jar:sources:2.13.14", "net.java.dev.jna:jna-platform:jar:sources:5.13.0", "com.eed3si9n:shaded-scalajson_2.13:jar:sources:1.0.0-M4", - "org.jline:jline-native:jar:sources:3.24.1", + "org.jline:jline-terminal:jar:sources:3.25.1", "org.scala-sbt:util-interface:jar:sources:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:jar:sources:0.9.1", "com.lmax:disruptor:jar:sources:3.4.2", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", "net.java.dev.jna:jna:jar:sources:5.14.0", - "org.jline:jline-terminal-jna:jar:sources:3.24.1", "org.jline:jline-terminal-jansi:jar:sources:3.24.1", - "org.jline:jline-terminal:jar:sources:3.24.1", "com.swoval:file-tree-views:jar:sources:2.1.12", "org.scala-sbt.jline:jline:jar:sources:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", "org.scala-lang:scala-reflect:jar:sources:2.13.14", @@ -5823,11 +6071,11 @@ "com.eed3si9n:sjson-new-scalajson_2.13:jar:sources:0.9.1", "org.scala-sbt:io_2.13:jar:sources:1.10.0", "org.scala-lang:scala-library:jar:sources:2.13.14", + "org.jline:jline-terminal:jar:sources:3.25.1", "org.scala-sbt:util-interface:jar:sources:1.10.0", "com.lmax:disruptor:jar:sources:3.4.2", - "org.jline:jline-terminal-jna:jar:sources:3.24.1", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", "org.jline:jline-terminal-jansi:jar:sources:3.24.1", - "org.jline:jline-terminal:jar:sources:3.24.1", "org.scala-sbt.jline:jline:jar:sources:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", "org.scala-lang:scala-reflect:jar:sources:2.13.14", "org.scala-sbt:core-macros_2.13:jar:sources:1.10.0", @@ -5990,10 +6238,11 @@ "org.scala-lang:scala-reflect:2.13.14", "com.lmax:disruptor:3.4.2", "org.scala-sbt:util-interface:1.10.0", - "org.jline:jline-terminal:3.24.1", + "org.jline:jline-terminal-jna:3.25.1", "org.fusesource.jansi:jansi:2.4.1", "net.java.dev.jna:jna:5.14.0", "com.swoval:file-tree-views:2.1.12", + "org.jline:jline-terminal:3.25.1", "org.scala-sbt:core-macros_2.13:1.10.0", "org.scala-sbt:zinc-classfile_2.13:1.10.0", "org.jline:jline-terminal-jansi:3.24.1", @@ -6001,7 +6250,6 @@ "org.apache.logging.log4j:log4j-api:2.17.1", "com.eed3si9n:sjson-new-scalajson_2.13:0.9.1", "com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4", - "org.jline:jline-native:3.24.1", "org.scala-lang:scala-compiler:2.13.14", "org.scala-sbt:util-logging_2.13:1.10.0", "net.java.dev.jna:jna-platform:5.13.0", @@ -6013,7 +6261,6 @@ "org.scala-lang:scala-library:2.13.14", "org.apache.logging.log4j:log4j-core:2.17.1", "org.scala-sbt:io_2.13:1.10.0", - "org.jline:jline-terminal-jna:3.24.1", "com.eed3si9n:shaded-jawn-parser_2.13:0.9.1", "org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0" ], @@ -6041,14 +6288,13 @@ "org.scala-lang:scala-library:jar:sources:2.13.14", "net.java.dev.jna:jna-platform:jar:sources:5.13.0", "com.eed3si9n:shaded-scalajson_2.13:jar:sources:1.0.0-M4", - "org.jline:jline-native:jar:sources:3.24.1", + "org.jline:jline-terminal:jar:sources:3.25.1", "org.scala-sbt:util-interface:jar:sources:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:jar:sources:0.9.1", "com.lmax:disruptor:jar:sources:3.4.2", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", "net.java.dev.jna:jna:jar:sources:5.14.0", - "org.jline:jline-terminal-jna:jar:sources:3.24.1", "org.jline:jline-terminal-jansi:jar:sources:3.24.1", - "org.jline:jline-terminal:jar:sources:3.24.1", "com.swoval:file-tree-views:jar:sources:2.1.12", "org.scala-sbt:compiler-bridge_2.13:jar:sources:1.10.0", "org.scala-sbt.jline:jline:jar:sources:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", @@ -6086,17 +6332,17 @@ "org.scala-lang:scala-reflect:2.13.14", "com.lmax:disruptor:3.4.2", "org.scala-sbt:util-interface:1.10.0", - "org.jline:jline-terminal:3.24.1", + "org.jline:jline-terminal-jna:3.25.1", "org.fusesource.jansi:jansi:2.4.1", "net.java.dev.jna:jna:5.14.0", "com.swoval:file-tree-views:2.1.12", + "org.jline:jline-terminal:3.25.1", "org.scala-sbt:core-macros_2.13:1.10.0", "org.jline:jline-terminal-jansi:3.24.1", "org.scala-sbt:collections_2.13:1.10.0", "org.apache.logging.log4j:log4j-api:2.17.1", "com.eed3si9n:sjson-new-scalajson_2.13:0.9.1", "com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4", - "org.jline:jline-native:3.24.1", "org.scala-lang:scala-compiler:2.13.14", "org.scala-sbt:util-logging_2.13:1.10.0", "net.java.dev.jna:jna-platform:5.13.0", @@ -6107,7 +6353,6 @@ "org.scala-lang:scala-library:2.13.14", "org.apache.logging.log4j:log4j-core:2.17.1", "org.scala-sbt:io_2.13:1.10.0", - "org.jline:jline-terminal-jna:3.24.1", "com.eed3si9n:shaded-jawn-parser_2.13:0.9.1", "org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0" ], @@ -6135,14 +6380,13 @@ "org.scala-lang:scala-library:jar:sources:2.13.14", "net.java.dev.jna:jna-platform:jar:sources:5.13.0", "com.eed3si9n:shaded-scalajson_2.13:jar:sources:1.0.0-M4", - "org.jline:jline-native:jar:sources:3.24.1", + "org.jline:jline-terminal:jar:sources:3.25.1", "org.scala-sbt:util-interface:jar:sources:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:jar:sources:0.9.1", "com.lmax:disruptor:jar:sources:3.4.2", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", "net.java.dev.jna:jna:jar:sources:5.14.0", - "org.jline:jline-terminal-jna:jar:sources:3.24.1", "org.jline:jline-terminal-jansi:jar:sources:3.24.1", - "org.jline:jline-terminal:jar:sources:3.24.1", "com.swoval:file-tree-views:jar:sources:2.1.12", "org.scala-sbt.jline:jline:jar:sources:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", "org.scala-lang:scala-reflect:jar:sources:2.13.14", @@ -6237,11 +6481,12 @@ "org.scala-lang:scala-reflect:2.13.14", "com.lmax:disruptor:3.4.2", "org.scala-sbt:util-interface:1.10.0", - "org.jline:jline-terminal:3.24.1", + "org.jline:jline-terminal-jna:3.25.1", "org.fusesource.jansi:jansi:2.4.1", "net.openhft:zero-allocation-hashing:0.16", "net.java.dev.jna:jna:5.14.0", "com.swoval:file-tree-views:2.1.12", + "org.jline:jline-terminal:3.25.1", "org.scala-sbt:core-macros_2.13:1.10.0", "org.scala-sbt:zinc-classfile_2.13:1.10.0", "org.jline:jline-terminal-jansi:3.24.1", @@ -6250,7 +6495,6 @@ "com.eed3si9n:sjson-new-scalajson_2.13:0.9.1", "com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4", "org.scala-sbt:util-control_2.13:1.10.0", - "org.jline:jline-native:3.24.1", "org.scala-lang:scala-compiler:2.13.14", "org.scala-sbt:zinc-classpath_2.13:1.10.0", "org.scala-sbt:util-logging_2.13:1.10.0", @@ -6264,7 +6508,6 @@ "org.scala-lang:scala-library:2.13.14", "org.apache.logging.log4j:log4j-core:2.17.1", "org.scala-sbt:io_2.13:1.10.0", - "org.jline:jline-terminal-jna:3.24.1", "org.scala-sbt:zinc-apiinfo_2.13:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:0.9.1", "org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0" @@ -6302,15 +6545,14 @@ "org.scala-lang.modules:scala-parser-combinators_2.13:jar:sources:1.1.2", "net.java.dev.jna:jna-platform:jar:sources:5.13.0", "com.eed3si9n:shaded-scalajson_2.13:jar:sources:1.0.0-M4", - "org.jline:jline-native:jar:sources:3.24.1", + "org.jline:jline-terminal:jar:sources:3.25.1", "org.scala-sbt:util-interface:jar:sources:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:jar:sources:0.9.1", "com.lmax:disruptor:jar:sources:3.4.2", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", "net.java.dev.jna:jna:jar:sources:5.14.0", - "org.jline:jline-terminal-jna:jar:sources:3.24.1", "org.scala-sbt:launcher-interface:jar:sources:1.4.2", "org.jline:jline-terminal-jansi:jar:sources:3.24.1", - "org.jline:jline-terminal:jar:sources:3.24.1", "com.swoval:file-tree-views:jar:sources:2.1.12", "org.scala-sbt:compiler-bridge_2.13:jar:sources:1.10.0", "org.scala-sbt.jline:jline:jar:sources:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", @@ -6359,12 +6601,13 @@ "org.scala-lang:scala-reflect:2.13.14", "com.lmax:disruptor:3.4.2", "org.scala-sbt:util-interface:1.10.0", - "org.jline:jline-terminal:3.24.1", + "org.jline:jline-terminal-jna:3.25.1", "org.fusesource.jansi:jansi:2.4.1", "net.openhft:zero-allocation-hashing:0.16", "net.java.dev.jna:jna:5.14.0", "org.scala-sbt:util-relation_2.13:1.10.0", "com.swoval:file-tree-views:2.1.12", + "org.jline:jline-terminal:3.25.1", "org.scala-sbt:core-macros_2.13:1.10.0", "org.scala-sbt:zinc-classfile_2.13:1.10.0", "org.jline:jline-terminal-jansi:3.24.1", @@ -6373,7 +6616,6 @@ "com.eed3si9n:sjson-new-scalajson_2.13:0.9.1", "com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4", "org.scala-sbt:util-control_2.13:1.10.0", - "org.jline:jline-native:3.24.1", "org.scala-lang:scala-compiler:2.13.14", "org.scala-sbt:zinc-classpath_2.13:1.10.0", "org.scala-sbt:util-logging_2.13:1.10.0", @@ -6389,7 +6631,6 @@ "org.apache.logging.log4j:log4j-core:2.17.1", "org.scala-sbt:zinc-persist-core-assembly:1.10.0", "org.scala-sbt:io_2.13:1.10.0", - "org.jline:jline-terminal-jna:3.24.1", "org.scala-sbt:zinc-apiinfo_2.13:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:0.9.1", "org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0" @@ -6428,15 +6669,14 @@ "org.scala-sbt:util-relation_2.13:jar:sources:1.10.0", "org.scala-sbt:zinc-compile-core_2.13:jar:sources:1.10.0", "com.eed3si9n:shaded-scalajson_2.13:jar:sources:1.0.0-M4", - "org.jline:jline-native:jar:sources:3.24.1", + "org.jline:jline-terminal:jar:sources:3.25.1", "org.scala-sbt:util-interface:jar:sources:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:jar:sources:0.9.1", "com.lmax:disruptor:jar:sources:3.4.2", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", "net.java.dev.jna:jna:jar:sources:5.14.0", - "org.jline:jline-terminal-jna:jar:sources:3.24.1", "org.scala-sbt:launcher-interface:jar:sources:1.4.2", "org.jline:jline-terminal-jansi:jar:sources:3.24.1", - "org.jline:jline-terminal:jar:sources:3.24.1", "com.swoval:file-tree-views:jar:sources:2.1.12", "org.scala-sbt:compiler-bridge_2.13:jar:sources:1.10.0", "org.scala-sbt.jline:jline:jar:sources:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", @@ -6511,12 +6751,13 @@ "org.scala-lang:scala-reflect:2.13.14", "com.lmax:disruptor:3.4.2", "org.scala-sbt:util-interface:1.10.0", - "org.jline:jline-terminal:3.24.1", + "org.jline:jline-terminal-jna:3.25.1", "org.fusesource.jansi:jansi:2.4.1", "net.openhft:zero-allocation-hashing:0.16", "net.java.dev.jna:jna:5.14.0", "org.scala-sbt:util-relation_2.13:1.10.0", "com.swoval:file-tree-views:2.1.12", + "org.jline:jline-terminal:3.25.1", "org.scala-sbt:sbinary_2.13:0.5.1", "org.scala-sbt:core-macros_2.13:1.10.0", "org.scala-sbt:zinc-classfile_2.13:1.10.0", @@ -6528,7 +6769,6 @@ "com.eed3si9n:sjson-new-scalajson_2.13:0.9.1", "com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4", "org.scala-sbt:util-control_2.13:1.10.0", - "org.jline:jline-native:3.24.1", "org.scala-lang:scala-compiler:2.13.14", "org.scala-sbt:zinc-classpath_2.13:1.10.0", "org.scala-sbt:util-logging_2.13:1.10.0", @@ -6544,7 +6784,6 @@ "org.apache.logging.log4j:log4j-core:2.17.1", "org.scala-sbt:zinc-persist-core-assembly:1.10.0", "org.scala-sbt:io_2.13:1.10.0", - "org.jline:jline-terminal-jna:3.24.1", "org.scala-sbt:zinc-apiinfo_2.13:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:0.9.1", "org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0" @@ -6580,16 +6819,15 @@ "org.scala-sbt:util-relation_2.13:jar:sources:1.10.0", "org.scala-sbt:zinc-compile-core_2.13:jar:sources:1.10.0", "com.eed3si9n:shaded-scalajson_2.13:jar:sources:1.0.0-M4", - "org.jline:jline-native:jar:sources:3.24.1", + "org.jline:jline-terminal:jar:sources:3.25.1", "org.scala-sbt:util-interface:jar:sources:1.10.0", "org.scala-lang.modules:scala-xml_2.13:jar:sources:2.3.0", "com.eed3si9n:shaded-jawn-parser_2.13:jar:sources:0.9.1", "com.lmax:disruptor:jar:sources:3.4.2", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", "net.java.dev.jna:jna:jar:sources:5.14.0", - "org.jline:jline-terminal-jna:jar:sources:3.24.1", "org.scala-sbt:launcher-interface:jar:sources:1.4.2", "org.jline:jline-terminal-jansi:jar:sources:3.24.1", - "org.jline:jline-terminal:jar:sources:3.24.1", "com.swoval:file-tree-views:jar:sources:2.1.12", "org.scala-sbt:compiler-bridge_2.13:jar:sources:1.10.0", "org.scala-sbt.jline:jline:jar:sources:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", @@ -6635,12 +6873,13 @@ "org.scala-lang:scala-reflect:2.13.14", "com.lmax:disruptor:3.4.2", "org.scala-sbt:util-interface:1.10.0", - "org.jline:jline-terminal:3.24.1", + "org.jline:jline-terminal-jna:3.25.1", "org.fusesource.jansi:jansi:2.4.1", "net.openhft:zero-allocation-hashing:0.16", "net.java.dev.jna:jna:5.14.0", "org.scala-sbt:util-relation_2.13:1.10.0", "com.swoval:file-tree-views:2.1.12", + "org.jline:jline-terminal:3.25.1", "org.scala-sbt:sbinary_2.13:0.5.1", "org.scala-sbt:core-macros_2.13:1.10.0", "org.scala-sbt:zinc-classfile_2.13:1.10.0", @@ -6652,7 +6891,6 @@ "com.eed3si9n:sjson-new-scalajson_2.13:0.9.1", "com.eed3si9n:shaded-scalajson_2.13:1.0.0-M4", "org.scala-sbt:util-control_2.13:1.10.0", - "org.jline:jline-native:3.24.1", "org.scala-lang:scala-compiler:2.13.14", "org.scala-sbt:zinc-classpath_2.13:1.10.0", "org.scala-sbt:util-logging_2.13:1.10.0", @@ -6669,7 +6907,6 @@ "org.scala-sbt:zinc-persist-core-assembly:1.10.0", "org.scala-sbt:zinc-persist_2.13:1.10.0", "org.scala-sbt:io_2.13:1.10.0", - "org.jline:jline-terminal-jna:3.24.1", "org.scala-sbt:zinc-apiinfo_2.13:1.10.0", "com.eed3si9n:shaded-jawn-parser_2.13:0.9.1", "org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0" @@ -6704,16 +6941,15 @@ "org.scala-sbt:util-relation_2.13:jar:sources:1.10.0", "org.scala-sbt:zinc-compile-core_2.13:jar:sources:1.10.0", "com.eed3si9n:shaded-scalajson_2.13:jar:sources:1.0.0-M4", - "org.jline:jline-native:jar:sources:3.24.1", + "org.jline:jline-terminal:jar:sources:3.25.1", "org.scala-sbt:util-interface:jar:sources:1.10.0", "org.scala-lang.modules:scala-xml_2.13:jar:sources:2.3.0", "com.eed3si9n:shaded-jawn-parser_2.13:jar:sources:0.9.1", "com.lmax:disruptor:jar:sources:3.4.2", + "org.jline:jline-terminal-jna:jar:sources:3.25.1", "net.java.dev.jna:jna:jar:sources:5.14.0", - "org.jline:jline-terminal-jna:jar:sources:3.24.1", "org.scala-sbt:launcher-interface:jar:sources:1.4.2", "org.jline:jline-terminal-jansi:jar:sources:3.24.1", - "org.jline:jline-terminal:jar:sources:3.24.1", "com.swoval:file-tree-views:jar:sources:2.1.12", "org.scala-sbt:compiler-bridge_2.13:jar:sources:1.10.0", "org.scala-sbt.jline:jline:jar:sources:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79", diff --git a/docs/newdocs/scala_versions.md b/docs/newdocs/scala_versions.md index a816752c..73d66a02 100644 --- a/docs/newdocs/scala_versions.md +++ b/docs/newdocs/scala_versions.md @@ -2,12 +2,12 @@ The scala version used by a buildable target is specified via the `ScalaConfiguration` passed in to the rule's `scala` attribute. -This attribute defaults to using the `default_scala` specified via `bind` in the `WORKSPACE` file of the repo. For example, suppose the `ScalaConfiguration` you wish to default to is defined by `//scala:2_13_14`. In your `WORKSPACE`, you would include: +This attribute defaults to using the `default_scala` specified via `bind` in the `WORKSPACE` file of the repo. For example, suppose the `ScalaConfiguration` you wish to default to is defined by `//scala:2_13`. In your `WORKSPACE`, you would include: ```python bind( name = "default_scala", - actual = "//scala:2_13_14", + actual = "//scala:2_13", ) ``` @@ -16,34 +16,34 @@ We provide two means of creating the `ScalaConfiguration`: `configure_bootstrap_ Example: ```python -compiler_classpath_2_13_14 = [ - "@scala_compiler_2_13_14//jar", - "@scala_library_2_13_14//jar", - "@scala_reflect_2_13_14//jar", +compiler_classpath_2_13 = [ + "@scala_compiler_2_13//jar", + "@scala_library_2_13//jar", + "@scala_reflect_2_13//jar", ] -runtime_classpath_2_13_14 = [ - "@scala_library_2_13_14//jar", +runtime_classpath_2_13 = [ + "@scala_library_2_13//jar", ] # This creates a basic ScalaConfiguration that relies on the scalac compiler configure_bootstrap_scala( - name = "bootstrap_2_13_14", - compiler_classpath = compiler_classpath_2_13_14, - runtime_classpath = runtime_classpath_2_13_14, + name = "bootstrap_2_13", + compiler_classpath = compiler_classpath_2_13, + runtime_classpath = runtime_classpath_2_13, version = "2.13.14", visibility = ["//visibility:public"], ) # compiler bridge needed to configure zinc compiler scala_library( - name = "compiler_bridge_2_13_14", + name = "compiler_bridge_2_13", srcs = [ "@compiler_bridge_2_13//:src", ], - scala = ":bootstrap_2_13_14", + scala = ":bootstrap_2_13", visibility = ["//visibility:public"], - deps = compiler_classpath_2_13_14 + [ + deps = compiler_classpath_2_13 + [ "@scala_annex_org_scala_sbt_compiler_interface//jar", "@scala_annex_org_scala_sbt_util_interface//jar", ], @@ -51,10 +51,10 @@ scala_library( # This augments the configuration to configure the zinc compiler configure_zinc_scala( - name = "zinc_2_13_14", - compiler_bridge = ":compiler_bridge_2_13_14", - compiler_classpath = compiler_classpath_2_13_14, - runtime_classpath = runtime_classpath_2_13_14, + name = "zinc_2_13", + compiler_bridge = ":compiler_bridge_2_13", + compiler_classpath = compiler_classpath_2_13, + runtime_classpath = runtime_classpath_2_13, version = "2.13.14", visibility = ["//visibility:public"], ) @@ -68,13 +68,13 @@ For example: scala_library( name = "example_compiled_with_scalac", srcs = glob(["**/*.scala"]) - scala = ":bootstrap_2_13_14 + scala = ":bootstrap_2_13 ) scala_library( name = "example_compiled_with_zinc", srcs = glob(["**/*.scala"]) - scala = ":zinc_2_13_14 + scala = ":zinc_2_13 ) # This would use whatever //external:default_scala points to (i.e. what you bind default_scala to in your WORKSPACE) diff --git a/rules/scala/workspace.bzl b/rules/scala/workspace.bzl index 3d48fe51..60a475b0 100644 --- a/rules/scala/workspace.bzl +++ b/rules/scala/workspace.bzl @@ -10,6 +10,10 @@ filegroup( visibility = ["//visibility:public"] )""" +scala_2_13_version = "2.13.14" +scala_3_version = "3.4.2" +zinc_version = "1.10.0" + def scala_artifacts(): return [ "ch.epfl.scala:bloop-frontend_2.12:1.0.0", @@ -18,29 +22,36 @@ def scala_artifacts(): "com.thesamet.scalapb:scalapb-runtime_2.13:0.11.17", "net.sourceforge.argparse4j:argparse4j:0.8.1", "org.jacoco:org.jacoco.core:0.7.5.201505241946", - "org.scala-lang:scala-compiler:2.13.14", - "org.scala-lang:scala-library:2.13.14", - "org.scala-lang:scala-reflect:2.13.14", - "org.scala-sbt:compiler-interface:1.10.0", - "org.scala-sbt:io_2.13:1.10.0", "org.scala-sbt:test-interface:1.0", - "org.scala-sbt:util-interface:1.10.0", - "org.scala-sbt:util-logging_2.13:1.10.0", - "org.scala-sbt:zinc_2.13:1.10.0", - "org.scala-sbt:zinc-apiinfo_2.13:1.10.0", - "org.scala-sbt:zinc-classpath_2.13:1.10.0", - "org.scala-sbt:zinc-compile-core_2.13:1.10.0", - "org.scala-sbt:zinc-core_2.13:1.10.0", - "org.scala-sbt:zinc-persist_2.13:1.10.0", + "org.scala-sbt:compiler-interface:{}".format(zinc_version), + "org.scala-sbt:io_2.13:{}".format(zinc_version), + "org.scala-sbt:util-interface:{}".format(zinc_version), + "org.scala-sbt:util-logging_2.13:{}".format(zinc_version), + "org.scala-sbt:zinc_2.13:{}".format(zinc_version), + "org.scala-sbt:zinc-apiinfo_2.13:{}".format(zinc_version), + "org.scala-sbt:zinc-classpath_2.13:{}".format(zinc_version), + "org.scala-sbt:zinc-compile-core_2.13:{}".format(zinc_version), + "org.scala-sbt:zinc-core_2.13:{}".format(zinc_version), + "org.scala-sbt:zinc-persist_2.13:{}".format(zinc_version), + "org.scala-sbt:compiler-interface:{}".format(zinc_version), + "org.scala-lang:scala-compiler:{}".format(scala_2_13_version), + "org.scala-lang:scala-library:{}".format(scala_2_13_version), + "org.scala-lang:scala-reflect:{}".format(scala_2_13_version), + "org.scala-lang:scala3-compiler_3:{}".format(scala_3_version), + "org.scala-lang:scala3-library_3:{}".format(scala_3_version), + # The compiler bridge has a dependency on compiler-interface, which has a dependency on the Scala 2 + # library. We need to set this to neverlink = True to avoid this the Scala 2 library being pulled + # onto the Scala 3, and other Scala versions like 2.12, compiler classpath during runtime. + maven.artifact("org.scala-lang", "scala3-sbt-bridge", scala_3_version, neverlink = True), # The compiler bridge has a dependency on compiler-interface, which has a dependency on the Scala 2 # library. We need to set this to neverlink = True to avoid this the Scala 2 library being pulled # onto the Scala 3, and other Scala versions like 2.12, compiler classpath during runtime. - maven.artifact("org.scala-sbt", "compiler-bridge_2.13", "1.10.0", neverlink = True), + maven.artifact("org.scala-sbt", "compiler-bridge_2.13", zinc_version, neverlink = True), ] def scala_repositories( - java_launcher_version = "5.0.0", - java_launcher_template_sha = "ab1370fd990a8bff61a83c7bd94746a3401a6d5d2299e54b1b6bc02db4f87f68"): + java_launcher_version = "7.2.0", + java_launcher_template_sha = "ee4aa47ae5e639632c67be5cc0ccbc4e941a67a1b884a1ce0c4329357a4b62b2"): maven_install( name = "annex", artifacts = scala_artifacts(), @@ -64,7 +75,6 @@ def scala_repositories( name = "anx_java_stub_template", sha256 = java_launcher_template_sha, urls = [ - "https://mirror.bazel.build/%s" % java_stub_template_url, "https://%s" % java_stub_template_url, ], ) diff --git a/rules/scala/workspace_2_12.bzl b/rules/scala/workspace_2_12.bzl index 596fa211..7a4eeb3c 100644 --- a/rules/scala/workspace_2_12.bzl +++ b/rules/scala/workspace_2_12.bzl @@ -1,15 +1,18 @@ load("@rules_jvm_external//:defs.bzl", "maven_install") load("@rules_jvm_external//:specs.bzl", "maven") +load("@rules_scala_annex//rules/scala:workspace.bzl", "zinc_version") + +scala_2_12_version = "2.12.19" def scala_2_12_artifacts(): return [ - "org.scala-lang:scala-compiler:2.12.19", - "org.scala-lang:scala-library:2.12.19", - "org.scala-lang:scala-reflect:2.12.19", + "org.scala-lang:scala-compiler:{}".format(scala_2_12_version), + "org.scala-lang:scala-library:{}".format(scala_2_12_version), + "org.scala-lang:scala-reflect:{}".format(scala_2_12_version), # The compiler bridge has a dependency on compiler-interface, which has a dependency on the Scala 2 # library. We need to set this to neverlink = True to avoid this the Scala 2 library being pulled # onto the Scala 3, and other Scala versions like 2.12, compiler classpath during runtime. - maven.artifact("org.scala-sbt", "compiler-bridge_2.12", "1.10.0", neverlink = True), + maven.artifact("org.scala-sbt", "compiler-bridge_2.12", zinc_version, neverlink = True), ] def scala_2_12_repositories(): diff --git a/rules/scala/workspace_3.bzl b/rules/scala/workspace_3.bzl deleted file mode 100644 index 86efe3e8..00000000 --- a/rules/scala/workspace_3.bzl +++ /dev/null @@ -1,26 +0,0 @@ -load("@rules_jvm_external//:defs.bzl", "maven_install") -load("@rules_jvm_external//:specs.bzl", "maven") - -def scala_3_artifacts(): - return [ - "org.scala-lang:scala3-compiler_3:3.4.2", - "org.scala-lang:scala3-library_3:3.4.2", - "org.scala-sbt:compiler-interface:1.10.0", - # The compiler bridge has a dependency on compiler-interface, which has a dependency on the Scala 2 - # library. We need to set this to neverlink = True to avoid this the Scala 2 library being pulled - # onto the Scala 3, and other Scala versions like 2.12, compiler classpath during runtime. - maven.artifact("org.scala-lang", "scala3-sbt-bridge", "3.4.2", neverlink = True), - ] - -def scala_3_repositories(): - maven_install( - name = "annex_3", - artifacts = scala_3_artifacts(), - repositories = [ - "https://repo.maven.apache.org/maven2", - "https://maven-central.storage-download.googleapis.com/maven2", - "https://mirror.bazel.build/repo1.maven.org/maven2", - ], - fetch_sources = True, - maven_install_json = "@rules_scala_annex//:annex_3_install.json", - ) diff --git a/scripts/gen-deps.sh b/scripts/gen-deps.sh index 42c9293a..5346bbc3 100755 --- a/scripts/gen-deps.sh +++ b/scripts/gen-deps.sh @@ -10,7 +10,6 @@ echo "$(dirname "$0")/.." echo "generating dependencies for main workspace" bazel run @unpinned_annex//:pin bazel run @unpinned_annex_2_12//:pin -bazel run @unpinned_annex_3//:pin bazel run @unpinned_annex_scalafmt//:pin bazel run @unpinned_annex_proto//:pin diff --git a/src/main/scala/BUILD b/src/main/scala/BUILD index 58dfb2f8..e908259c 100644 --- a/src/main/scala/BUILD +++ b/src/main/scala/BUILD @@ -4,39 +4,32 @@ load( "configure_zinc_scala", "scala_library", ) - -alias( - name = "bootstrap", - actual = ":bootstrap_2_13_14", - visibility = ["//visibility:public"], +load( + "@rules_scala_annex//rules/scala:workspace.bzl", + "scala_2_13_version", + "scala_3_version", ) alias( - name = "bootstrap_3", - actual = ":bootstrap_3_4_2", + name = "bootstrap", + actual = ":bootstrap_2_13", visibility = ["//visibility:public"], ) alias( name = "zinc", - actual = ":zinc_2_13_14", - visibility = ["//visibility:public"], -) - -alias( - name = "zinc_3", - actual = ":zinc_3_4_2", + actual = ":zinc_2_13", visibility = ["//visibility:public"], ) # Scala 2.13 -compiler_classpath_2_13_14 = [ +compiler_classpath_2_13 = [ "@annex//:org_scala_lang_scala_compiler", "@annex//:org_scala_lang_scala_library", "@annex//:org_scala_lang_scala_reflect", ] -runtime_classpath_2_13_14 = [ +runtime_classpath_2_13 = [ "@annex//:org_scala_lang_scala_library", ] @@ -48,26 +41,27 @@ shared_global_scalacopts = [ shared_scala2_global_scalacopts = [ "-Xlint:_,-unused", "-Ytasty-reader", + "-Xsource:3", ] scala2_global_scalacopts = shared_global_scalacopts + shared_scala2_global_scalacopts configure_bootstrap_scala( - name = "bootstrap_2_13_14", - compiler_classpath = compiler_classpath_2_13_14, + name = "bootstrap_2_13", + compiler_classpath = compiler_classpath_2_13, global_scalacopts = scala2_global_scalacopts, - runtime_classpath = runtime_classpath_2_13_14, - version = "2.13.14", + runtime_classpath = runtime_classpath_2_13, + version = scala_2_13_version, visibility = ["//visibility:public"], ) configure_zinc_scala( - name = "zinc_2_13_14", + name = "zinc_2_13", compiler_bridge = "@annex//:org_scala_sbt_compiler_bridge_2_13", - compiler_classpath = compiler_classpath_2_13_14, + compiler_classpath = compiler_classpath_2_13, global_scalacopts = scala2_global_scalacopts, - runtime_classpath = runtime_classpath_2_13_14, - version = "2.13.14", + runtime_classpath = runtime_classpath_2_13, + version = scala_2_13_version, visibility = ["//visibility:public"], ) @@ -78,43 +72,43 @@ configure_zinc_scala( scala_library( name = "scala-sdk", deps_used_whitelist = [ - "@annex_3//:org_scala_lang_scala3_library_3_3_4_2", + "@annex//:org_scala_lang_scala3_library", ], scala = ":zinc_3", deps = [ - "@annex_3//:org_scala_lang_scala3_library_3_3_4_2", + "@annex//:org_scala_lang_scala3_library", ], ) -compiler_classpath_3_4_2 = [ - "@annex_3//:org_scala_lang_scala3_compiler_3_3_4_2", - "@annex_3//:org_scala_lang_scala3_library_3_3_4_2", +compiler_classpath_3 = [ + "@annex//:org_scala_lang_scala3_compiler_3", + "@annex//:org_scala_lang_scala3_library_3", ] -runtime_classpath_3_4_2 = [ - "@annex_3//:org_scala_lang_scala3_library_3_3_4_2", - "@annex_3//:org_scala_lang_scala3_interfaces", - "@annex_3//:org_scala_lang_tasty_core_3", +runtime_classpath_3 = [ + "@annex//:org_scala_lang_scala3_library_3", + "@annex//:org_scala_lang_scala3_interfaces", + "@annex//:org_scala_lang_tasty_core_3", ] configure_bootstrap_scala( - name = "bootstrap_3_4_2", - compiler_classpath = compiler_classpath_3_4_2, + name = "bootstrap_3", + compiler_classpath = compiler_classpath_3, global_scalacopts = shared_global_scalacopts, - runtime_classpath = runtime_classpath_3_4_2, + runtime_classpath = runtime_classpath_3, use_ijar = False, - version = "3.4.2", + version = scala_3_version, visibility = ["//visibility:public"], ) configure_zinc_scala( - name = "zinc_3_4_2", - compiler_bridge = "@annex_3//:org_scala_lang_scala3_sbt_bridge_3_4_2", - compiler_classpath = compiler_classpath_3_4_2, + name = "zinc_3", + compiler_bridge = "@annex//:org_scala_lang_scala3_sbt_bridge", + compiler_classpath = compiler_classpath_3, global_scalacopts = shared_global_scalacopts, - runtime_classpath = runtime_classpath_3_4_2, + runtime_classpath = runtime_classpath_3, use_ijar = False, - version = "3.4.2", + version = scala_3_version, visibility = ["//visibility:public"], ) diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/CLassLoaders.scala b/src/main/scala/higherkindness/rules_scala/common/classloaders/ClassLoaders.scala similarity index 100% rename from src/main/scala/higherkindness/rules_scala/common/sbt-testing/CLassLoaders.scala rename to src/main/scala/higherkindness/rules_scala/common/classloaders/ClassLoaders.scala diff --git a/tests/WORKSPACE b/tests/WORKSPACE index 8cd0e8dd..df977198 100644 --- a/tests/WORKSPACE +++ b/tests/WORKSPACE @@ -86,7 +86,7 @@ load( "scala_repositories", ) -# Scala +# Scala 2.13 and 3 scala_repositories() load("@annex//:defs.bzl", annex_pinned_maven_install = "pinned_maven_install") @@ -104,15 +104,6 @@ load("@annex_2_12//:defs.bzl", annex_2_12_pinned_maven_install = "pinned_maven_i annex_2_12_pinned_maven_install() -# Scala 3 -load("@rules_scala_annex//rules/scala:workspace_3.bzl", "scala_3_repositories") - -scala_3_repositories() - -load("@annex_3//:defs.bzl", annex_3_pinned_maven_install = "pinned_maven_install") - -annex_3_pinned_maven_install() - load( "@rules_scala_annex//rules/scala_proto:workspace.bzl", "scala_proto_register_toolchains", @@ -139,7 +130,7 @@ scala_import_external( emulate_rules_scala( extra_deps = [ - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_reflect_2_13", "@annex_test//:org_scala_lang_modules_scala_xml_2_13", ], scala = "@//scala:2_13", @@ -200,7 +191,7 @@ jvm_maven_import_external( bind( name = "default_scala", - actual = "//scala:zinc_2_13_14", + actual = "//scala:zinc_2_13", ) http_file( diff --git a/tests/compile/log_level/BUILD b/tests/compile/log_level/BUILD index 55554e47..ead1625e 100644 --- a/tests/compile/log_level/BUILD +++ b/tests/compile/log_level/BUILD @@ -3,6 +3,6 @@ load("@rules_scala_annex//rules:scala.bzl", "scala_binary") scala_binary( name = "lib", srcs = ["Example.scala"], - scala = "//scala:zinc_2_13_14_log_level_debug", + scala = "//scala:zinc_2_13_log_level_debug", deps = [], ) diff --git a/tests/dependencies/indirect/BUILD b/tests/dependencies/indirect/BUILD index b2aadefc..7e1d6662 100644 --- a/tests/dependencies/indirect/BUILD +++ b/tests/dependencies/indirect/BUILD @@ -59,19 +59,19 @@ scala_library( scala_library( name = "define_a", srcs = ["A.scala"], - scala = "@rules_scala_annex//src/main/scala:zinc_2_13_14", + scala = "@rules_scala_annex//src/main/scala:zinc_2_13", ) scala_library( name = "define_b", srcs = ["B.scala"], - scala = "@rules_scala_annex//src/main/scala:zinc_2_13_14", + scala = "@rules_scala_annex//src/main/scala:zinc_2_13", deps = [":define_a"], ) scala_library( name = "define_c", srcs = ["C.scala"], - scala = "@rules_scala_annex//src/main/scala:zinc_2_13_14", + scala = "@rules_scala_annex//src/main/scala:zinc_2_13", deps = [":define_b"], ) diff --git a/tests/plugins/classpath/BUILD b/tests/plugins/classpath/BUILD index 4181c7be..b185d664 100644 --- a/tests/plugins/classpath/BUILD +++ b/tests/plugins/classpath/BUILD @@ -40,8 +40,8 @@ scala_library( tags = ["manual"], deps = [ ":plugin-lib", - "@annex//:org_scala_lang_scala_compiler_2_13_14", - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_compiler_2_13", + "@annex//:org_scala_lang_scala_reflect_2_13", ], ) diff --git a/tests/plugins/kind-projector/BUILD b/tests/plugins/kind-projector/BUILD index 350ecc22..224525b3 100644 --- a/tests/plugins/kind-projector/BUILD +++ b/tests/plugins/kind-projector/BUILD @@ -1,34 +1,35 @@ load("@rules_scala_annex//rules:scala.bzl", "configure_zinc_scala", "scala_library") +load("@rules_scala_annex//rules/scala:workspace.bzl", "scala_2_13_version") scala_library( name = "kind-projector", srcs = ["KindProjector.scala"], plugins = [ - "@annex_test//:org_typelevel_kind_projector_2_13_14", + "@annex_test//:org_typelevel_kind_projector_2_13", ], tags = ["manual"], ) configure_zinc_scala( - name = "scala_2_13_14_with_kind_projector", + name = "scala_2_13_with_kind_projector", compiler_bridge = "@annex//:org_scala_sbt_compiler_bridge_2_13", compiler_classpath = [ - "@annex//:org_scala_lang_scala_compiler_2_13_14", - "@annex//:org_scala_lang_scala_reflect_2_13_14", - "@annex//:org_scala_lang_scala_library_2_13_14", + "@annex//:org_scala_lang_scala_compiler", + "@annex//:org_scala_lang_scala_reflect", + "@annex//:org_scala_lang_scala_library", ], global_plugins = [ - "@annex_test//:org_typelevel_kind_projector_2_13_14", + "@annex_test//:org_typelevel_kind_projector_2_13", ], runtime_classpath = [ - "@annex//:org_scala_lang_scala_library_2_13_14", + "@annex//:org_scala_lang_scala_library", ], - version = "2.13.14", + version = scala_2_13_version, ) scala_library( name = "kind-projector-via-global-plugins", srcs = ["KindProjector.scala"], - scala = ":scala_2_13_14_with_kind_projector", + scala = ":scala_2_13_with_kind_projector", tags = ["manual"], ) diff --git a/tests/plugins/macros/BUILD b/tests/plugins/macros/BUILD index f6c6d234..0bab3dd5 100644 --- a/tests/plugins/macros/BUILD +++ b/tests/plugins/macros/BUILD @@ -6,7 +6,7 @@ scala_library( scala = "//scala:2_13", deps = [ ":macro_bad", - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_reflect_2_13", ], ) @@ -17,7 +17,7 @@ scala_library( scala = "//scala:2_13", deps = [ ":util", - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_reflect_2_13", ], ) @@ -28,7 +28,7 @@ scala_library( scala = "//scala:2_13", deps = [ ":macro", - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_reflect_2_13", ], ) @@ -38,7 +38,7 @@ scala_library( scala = "//scala:2_13", deps = [ ":util", - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_reflect_2_13", ], ) @@ -47,7 +47,7 @@ scala_library( srcs = ["MacroUtil.scala"], scala = "//scala:2_13", deps = [ - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_reflect_2_13", ], ) diff --git a/tests/providers/BUILD b/tests/providers/BUILD index 446a7424..0878025a 100644 --- a/tests/providers/BUILD +++ b/tests/providers/BUILD @@ -14,18 +14,22 @@ load( "consume_scala_configuration", "consume_zinc_configuration", ) +load( + "@rules_scala_annex//rules/scala:workspace.bzl", + "scala_2_13_version" +) declare_scala_configuration( name = "provided_scala_configuration", compiler_classpath = [ - "@annex//:org_scala_lang_scala_compiler_2_13_14", - "@annex//:org_scala_lang_scala_library_2_13_14", - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_compiler", + "@annex//:org_scala_lang_scala_library", + "@annex//:org_scala_lang_scala_reflect", ], runtime_classpath = [ - "@annex//:org_scala_lang_scala_library_2_13_14", + "@annex//:org_scala_lang_scala_library", ], - version = "2.13.14", + version = scala_2_13_version, ) bootstrap_scala_library( @@ -33,9 +37,9 @@ bootstrap_scala_library( srcs = ["@compiler_bridge_2_13//:src"], scala = ":provided_scala_configuration", deps = [ - "@annex//:org_scala_lang_scala_compiler_2_13_14", - "@annex//:org_scala_lang_scala_library_2_13_14", - "@annex//:org_scala_lang_scala_reflect_2_13_14", + "@annex//:org_scala_lang_scala_compiler", + "@annex//:org_scala_lang_scala_library", + "@annex//:org_scala_lang_scala_reflect", "@annex//:org_scala_sbt_compiler_interface", "@annex//:org_scala_sbt_util_interface", ], diff --git a/tests/scala/BUILD b/tests/scala/BUILD index f3aac986..6d6d0f61 100644 --- a/tests/scala/BUILD +++ b/tests/scala/BUILD @@ -4,139 +4,148 @@ load( "configure_zinc_scala", "scala_library", ) +load( + "@rules_scala_annex//rules/scala:workspace.bzl", + "scala_2_13_version", + "scala_3_version", +) +load( + "@rules_scala_annex//rules/scala:workspace_2_12.bzl", + "scala_2_12_version", +) alias( name = "2_12", - actual = ":zinc_2_12_19", + actual = ":zinc_2_12", visibility = ["//visibility:public"], ) alias( name = "2_13", - actual = ":zinc_2_13_14", + actual = ":zinc_2_13", visibility = ["//visibility:public"], ) alias( name = "3", - actual = ":zinc_3_4_2", + actual = ":zinc_3", visibility = ["//visibility:public"], ) -# zinc 2.12.19 +# zinc 2.12 -compiler_classpath_2_12_19 = [ - "@annex_2_12//:org_scala_lang_scala_compiler_2_12_19", - "@annex_2_12//:org_scala_lang_scala_reflect_2_12_19", - "@annex_2_12//:org_scala_lang_scala_library_2_12_19", +compiler_classpath_2_12 = [ + "@annex_2_12//:org_scala_lang_scala_compiler", + "@annex_2_12//:org_scala_lang_scala_reflect", + "@annex_2_12//:org_scala_lang_scala_library", ] -runtime_classpath_2_12_19 = [ - "@annex_2_12//:org_scala_lang_scala_library_2_12_19", +runtime_classpath_2_12 = [ + "@annex_2_12//:org_scala_lang_scala_library", ] configure_bootstrap_scala( - name = "bootstrap_2_12_19", - compiler_classpath = compiler_classpath_2_12_19, - runtime_classpath = runtime_classpath_2_12_19, - version = "2.12.19", + name = "bootstrap_2_12", + compiler_classpath = compiler_classpath_2_12, + runtime_classpath = runtime_classpath_2_12, + version = scala_2_12_version, visibility = ["//visibility:public"], ) configure_zinc_scala( - name = "zinc_2_12_19", - compiler_bridge = "@annex_2_12//:org_scala_sbt_compiler_bridge_2_12", - compiler_classpath = compiler_classpath_2_12_19, - runtime_classpath = runtime_classpath_2_12_19, - version = "2.12.19", + name = "zinc_2_12", + compiler_bridge = "@annex_2_12//:org_scala_sbt_compiler_bridge", + compiler_classpath = compiler_classpath_2_12, + runtime_classpath = runtime_classpath_2_12, + version = scala_2_12_version, visibility = ["//visibility:public"], ) -# zinc 2.13.14 +# zinc scala 2 -compiler_classpath_2_13_14 = [ - "@annex//:org_scala_lang_scala_compiler_2_13_14", - "@annex//:org_scala_lang_scala_reflect_2_13_14", - "@annex//:org_scala_lang_scala_library_2_13_14", +compiler_classpath_2_13 = [ + "@annex//:org_scala_lang_scala_compiler", + "@annex//:org_scala_lang_scala_reflect", + "@annex//:org_scala_lang_scala_library", ] -runtime_classpath_2_13_14 = [ - "@annex//:org_scala_lang_scala_library_2_13_14", +runtime_classpath_2_13 = [ + "@annex//:org_scala_lang_scala_library", ] configure_bootstrap_scala( - name = "bootstrap_2_13_14", - compiler_classpath = compiler_classpath_2_13_14, - runtime_classpath = runtime_classpath_2_13_14, - version = "2.13.14", + name = "bootstrap_2_13", + compiler_classpath = compiler_classpath_2_13, + runtime_classpath = runtime_classpath_2_13, + version = scala_2_13_version, visibility = ["//visibility:public"], ) configure_zinc_scala( - name = "zinc_2_13_14", + name = "zinc_2_13", compiler_bridge = "@annex//:org_scala_sbt_compiler_bridge_2_13", - compiler_classpath = compiler_classpath_2_13_14, + compiler_classpath = compiler_classpath_2_13, global_scalacopts = [ "-Ytasty-reader", ], - runtime_classpath = runtime_classpath_2_13_14, - version = "2.13.14", + runtime_classpath = runtime_classpath_2_13, + version = scala_2_13_version, visibility = ["//visibility:public"], ) -# zinc 3.4.2 +# zinc scala 3 -compiler_classpath_3_4_2 = [ - "@annex_3//:org_scala_lang_scala3_compiler_3_3_4_2", - "@annex_3//:org_scala_lang_scala3_library_3_3_4_2", +compiler_classpath_3 = [ + "@annex//:org_scala_lang_scala3_compiler_3", + "@annex//:org_scala_lang_scala3_library_3", ] -runtime_classpath_3_4_2 = [ - "@annex_3//:org_scala_lang_scala3_library_3_3_4_2", - "@annex_3//:org_scala_lang_scala3_interfaces", - "@annex_3//:org_scala_lang_tasty_core_3", +runtime_classpath_3 = [ + "@annex//:org_scala_lang_scala3_library_3", + "@annex//:org_scala_lang_scala3_interfaces", + "@annex//:org_scala_lang_tasty_core_3", ] configure_bootstrap_scala( - name = "bootstrap_3_4_2", - compiler_classpath = compiler_classpath_3_4_2, - runtime_classpath = runtime_classpath_3_4_2, + name = "bootstrap_3", + compiler_classpath = compiler_classpath_3, + runtime_classpath = runtime_classpath_3, use_ijar = False, - version = "3.4.2", + version = scala_3_version, visibility = ["//visibility:public"], ) configure_zinc_scala( - name = "zinc_3_4_2", - compiler_bridge = "@annex_3//:org_scala_lang_scala3_sbt_bridge_3_4_2", - compiler_classpath = compiler_classpath_3_4_2, - runtime_classpath = runtime_classpath_3_4_2, + name = "zinc_3", + compiler_bridge = "@annex//:org_scala_lang_scala3_sbt_bridge", + compiler_classpath = compiler_classpath_3, + runtime_classpath = runtime_classpath_3, use_ijar = False, - version = "3.4.2", + version = scala_3_version, visibility = ["//visibility:public"], ) # For global scalacoptions test configure_zinc_scala( - name = "zinc_2_13_14_fatal_deprecation_opt", + name = "zinc_2_13_fatal_deprecation_opt", compiler_bridge = "@annex//:org_scala_sbt_compiler_bridge_2_13", - compiler_classpath = compiler_classpath_2_13_14, + compiler_classpath = compiler_classpath_2_13, global_scalacopts = [ "-deprecation", "-Xfatal-warnings", ], - runtime_classpath = runtime_classpath_2_13_14, - version = "2.13.14", + runtime_classpath = runtime_classpath_2_13, + version = scala_2_13_version, visibility = ["//scalacopts/rule:__subpackages__"], ) # for log_level test configure_zinc_scala( - name = "zinc_2_13_14_log_level_debug", + name = "zinc_2_13_log_level_debug", compiler_bridge = "@annex//:org_scala_sbt_compiler_bridge_2_13", - compiler_classpath = compiler_classpath_2_13_14, + compiler_classpath = compiler_classpath_2_13, log_level = "debug", - runtime_classpath = runtime_classpath_2_13_14, - version = "2.13.14", + runtime_classpath = runtime_classpath_2_13, + version = scala_2_13_version, visibility = ["//visibility:public"], )