Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Update Bloop to 2.0.2 #3192

Merged
merged 2 commits into from
Sep 26, 2024
Merged

chore: Update Bloop to 2.0.2 #3192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4297a75
chore: Update Bloop to 2.0.2
tgodzik Sep 20, 2024
2d8a6ba
Merge remote-tracking branch 'origin/main' into update-bloop
Gedochao Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions modules/integration/src/test/scala/scala/cli/integration/ArgsFileTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ class ArgsFileTests extends ScalaCliSuite {
os.rel / "args.txt" -> """|-release
|8""".stripMargin,
os.rel / fileName ->
s"""|import java.net.http.HttpClient
|
|println("Hello :)")
s"""|
|println("Hello :)".repeat(11))
|""".stripMargin
)

Expand All @@ -40,9 +39,8 @@ class ArgsFileTests extends ScalaCliSuite {
os.rel / "args.txt" -> """|-release 8""".stripMargin,
os.rel / "script-with-shebang" ->
s"""|#!/usr/bin/env -S ${TestUtil.cli.mkString(" ")} shebang @args.txt
|import java.net.http.HttpClient
|
|println("Hello :)")
|println("Hello :)".repeat(11))
|""".stripMargin
)

Expand Down
16 changes: 8 additions & 8 deletions modules/integration/src/test/scala/scala/cli/integration/BloopTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,18 +211,18 @@ class BloopTests extends ScalaCliSuite {
val content =
if (isScala)
"""|package a
|import java.net.http.HttpClient
|
|
|trait Simple {
| def httpClient: HttpClient
| val str = "".repeat(2)
|}
|""".stripMargin
else """|package a;
|
|import java.net.http.HttpClient;
|
|interface Simple {
| HttpClient httpClient();
|class Simple {
| void hello(){
| String str = "".repeat(2);
| }
|}
|""".stripMargin
val inputs = TestInputs(os.rel / s"Simple.$lang" -> s"$directive$content")
Expand All @@ -234,8 +234,8 @@ class BloopTests extends ScalaCliSuite {

val compilationError = res.err.text()
val message =
if (isScala) "value http is not a member of java.net"
else "error: package java.net.http does not exist"
if (isScala) "value repeat is not a member of String"
else "error: cannot find symbol"

assert(compilationError.contains("Compilation failed"))
assert(compilationError.contains(message))
Expand Down
2 changes: 1 addition & 1 deletion project/deps.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ object Deps {
def signingCliJvmVersion = Java.defaultJava
def javaSemanticdb = "0.10.0"
def javaClassName = "0.1.3"
def bloop = "2.0.0"
def bloop = "2.0.2"
def sbtVersion = "1.10.2"
def mavenVersion = "3.8.1"
def mavenScalaCompilerPluginVersion = "4.9.1"
Expand Down
Loading