From 6cf3047ad5f109b3a0e158b4ee56383fc3aec8dc Mon Sep 17 00:00:00 2001 From: Marcin Abramowicz Date: Fri, 25 Aug 2023 11:29:06 +0200 Subject: [PATCH 1/4] [fix] now server can obtain scala3 compiler --- aspects/rules/scala/scala_info.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aspects/rules/scala/scala_info.bzl b/aspects/rules/scala/scala_info.bzl index 107100b5e..a3520abf8 100644 --- a/aspects/rules/scala/scala_info.bzl +++ b/aspects/rules/scala/scala_info.bzl @@ -6,12 +6,12 @@ def find_scalac_classpath(runfiles): found_scala_compiler_jar = False for file in runfiles: name = file.basename - if file.extension == "jar" and "scala-compiler" in name: + if file.extension == "jar" and ("scala3-compiler" or "scala-compiler") in name: found_scala_compiler_jar = True result.append(file) - elif file.extension == "jar" and ("scala-library" in name or "scala-reflect" in name): + elif file.extension == "jar" and ("scala3-library" in name or "scala3-reflect" in name or "scala-library" in name or "scala-reflect" in name): result.append(file) - return result if found_scala_compiler_jar and len(result) >= 3 else [] + return result if found_scala_compiler_jar and len(result) >= 2 else [] def extract_scala_toolchain_info(target, ctx, output_groups, **kwargs): runfiles = target.default_runfiles.files.to_list() From 400d545fa14512e0ba3b7cd28111f1752927dc9e Mon Sep 17 00:00:00 2001 From: Marcin Abramowicz Date: Mon, 28 Aug 2023 11:55:30 +0200 Subject: [PATCH 2/4] regex fix --- .../bsp/bazel/server/sync/languages/scala/ScalaSdkResolver.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/jetbrains/bsp/bazel/server/sync/languages/scala/ScalaSdkResolver.kt b/server/src/main/java/org/jetbrains/bsp/bazel/server/sync/languages/scala/ScalaSdkResolver.kt index 9ea37bea2..f41065256 100644 --- a/server/src/main/java/org/jetbrains/bsp/bazel/server/sync/languages/scala/ScalaSdkResolver.kt +++ b/server/src/main/java/org/jetbrains/bsp/bazel/server/sync/languages/scala/ScalaSdkResolver.kt @@ -58,6 +58,6 @@ class ScalaSdkResolver(private val bazelPathsResolver: BazelPathsResolver) { 0 } private val VERSION_PATTERN = - Pattern.compile("(?:processed_)?scala-(?:library|compiler|reflect)-([.\\d]+)\\.jar") + Pattern.compile("(?:processed_)?scala3?-(?:library|compiler|reflect)(?:_3)?-([.\\d]+)\\.jar") } } From ae78004bf7f8d2f13230fe1fc14d7e1251c33f4c Mon Sep 17 00:00:00 2001 From: Marcin Abramowicz Date: Tue, 29 Aug 2023 15:56:24 +0200 Subject: [PATCH 3/4] ohh now the syntax is correct --- aspects/rules/scala/scala_info.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aspects/rules/scala/scala_info.bzl b/aspects/rules/scala/scala_info.bzl index a3520abf8..2e7f46ed6 100644 --- a/aspects/rules/scala/scala_info.bzl +++ b/aspects/rules/scala/scala_info.bzl @@ -6,7 +6,7 @@ def find_scalac_classpath(runfiles): found_scala_compiler_jar = False for file in runfiles: name = file.basename - if file.extension == "jar" and ("scala3-compiler" or "scala-compiler") in name: + if file.extension == "jar" and ("scala3-compiler" in name or "scala-compiler" in name): found_scala_compiler_jar = True result.append(file) elif file.extension == "jar" and ("scala3-library" in name or "scala3-reflect" in name or "scala-library" in name or "scala-reflect" in name): From 1bcda0116951173dc542e8f04ad7e8db754afce2 Mon Sep 17 00:00:00 2001 From: Marcin Abramowicz Date: Tue, 29 Aug 2023 16:01:13 +0200 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f05cade3..d7fe01b7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ ### Fixes 🛠️ -- aspects dont fail if target contains another target as `srcs` attribute +- aspects don't fail if target contains another target as `srcs` attribute +- now server can obtain scala 3 compiler ## [3.0.0] - 09.08.2023