Skip to content

Commit

Permalink
Merge pull request #2364 from scalacenter/update/librarymanagement-iv…
Browse files Browse the repository at this point in the history
…y-1.10.1

build(deps): Update librarymanagement-ivy, sbt, ... from 1.10.0 to 1.10.1
  • Loading branch information
tgodzik authored Jul 8, 2024
2 parents e757787 + 667622b commit df7ee7c
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.0
sbt.version=1.10.1

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.0
sbt.version=1.10.1

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.10.0
sbt.version=1.10.1

Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1
8 changes: 4 additions & 4 deletions frontend/src/test/scala/bloop/BaseCompileSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -845,13 +845,13 @@ abstract class BaseCompileSpec extends bloop.testing.BaseSuite {
val supportsLocalCompilation =
javax.tools.ToolProvider.getSystemJavaCompiler() != null
if (supportsLocalCompilation) {
s"""|[E2] ${targetFoo}:3
s"""|[E2] ${targetFoo}:3:19
| cannot find symbol
| symbol: class Bar
| location: class Foo
| L3: Bar
| ^^^
|[E1] ${targetFoo}:3
|[E1] ${targetFoo}:3:5
| cannot find symbol
| symbol: class Bar
| location: class Foo
Expand Down Expand Up @@ -1100,7 +1100,7 @@ abstract class BaseCompileSpec extends bloop.testing.BaseSuite {

val targetB = TestUtil.universalPath("a/src/B.java")
val cannotFindSymbolError: String = {
s"""[E1] ${targetB}:1
s"""[E1] ${targetB}:1:24
| cannot find symbol
| symbol: class A
| L1: A
Expand Down Expand Up @@ -1205,7 +1205,7 @@ abstract class BaseCompileSpec extends bloop.testing.BaseSuite {
val targetService = TestUtil.universalPath("a/src/Service.java")
assertNoDiff(
logger.renderErrors(exceptContaining = "Failed to compile"),
s"""[E1] ${targetService}:4
s"""[E1] ${targetService}:4:18
| incompatible types: int cannot be converted to java.lang.String
| L4: 123
| ^^^
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ object Dependencies {
val nailgunCommit = "a2520c1e"

// Keep in sync in BloopComponentCompiler
val zincVersion = "1.10.0"
val zincVersion = "1.10.1"

val bspVersion = "2.1.1"

val scalazVersion = "7.3.8"
val lmVersion = "1.10.0"
val lmVersion = "1.10.1"
val configDirsVersion = "26"
val caseAppVersion = "2.0.6"
val sourcecodeVersion = "0.4.2"
val sbtTestInterfaceVersion = "1.0"
val sbtTestAgentVersion = "1.10.0"
val sbtTestAgentVersion = "1.10.1"
val junitVersion = "0.13.3"
val directoryWatcherVersion = "0.8.0+6-f651bd93"
val monixVersion = "3.2.0"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.0
sbt.version=1.10.1

0 comments on commit df7ee7c

Please sign in to comment.