diff --git a/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties b/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties index 16c8f5b8d..74d800f21 100644 --- a/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties +++ b/frontend/src/test/resources/compiler-plugin-allowlist/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties b/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties index 16c8f5b8d..74d800f21 100644 --- a/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties +++ b/frontend/src/test/resources/cross-test-build-scala-native-0.4/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/cross-test-build-scala-native-0.5/project/build.properties b/frontend/src/test/resources/cross-test-build-scala-native-0.5/project/build.properties index 16c8f5b8d..74d800f21 100644 --- a/frontend/src/test/resources/cross-test-build-scala-native-0.5/project/build.properties +++ b/frontend/src/test/resources/cross-test-build-scala-native-0.5/project/build.properties @@ -1,2 +1,2 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties index 081fdbbc7..ee4c672cd 100644 --- a/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties +++ b/frontend/src/test/resources/cross-test-build-scalajs-0.6/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties index 081fdbbc7..ee4c672cd 100644 --- a/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties +++ b/frontend/src/test/resources/cross-test-build-scalajs-1.0/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties b/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties index 081fdbbc7..ee4c672cd 100644 --- a/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties +++ b/frontend/src/test/resources/cross-test-build-scalajs-1.x/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/custom-test-framework/project/build.properties b/frontend/src/test/resources/custom-test-framework/project/build.properties index 081fdbbc7..ee4c672cd 100644 --- a/frontend/src/test/resources/custom-test-framework/project/build.properties +++ b/frontend/src/test/resources/custom-test-framework/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/no-test-frameworks/project/project/build.properties b/frontend/src/test/resources/no-test-frameworks/project/project/build.properties index 081fdbbc7..ee4c672cd 100644 --- a/frontend/src/test/resources/no-test-frameworks/project/project/build.properties +++ b/frontend/src/test/resources/no-test-frameworks/project/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/scala-seed-project/project/build.properties b/frontend/src/test/resources/scala-seed-project/project/build.properties index 081fdbbc7..ee4c672cd 100644 --- a/frontend/src/test/resources/scala-seed-project/project/build.properties +++ b/frontend/src/test/resources/scala-seed-project/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/resources/simple-build/project/build.properties b/frontend/src/test/resources/simple-build/project/build.properties index 081fdbbc7..ee4c672cd 100644 --- a/frontend/src/test/resources/simple-build/project/build.properties +++ b/frontend/src/test/resources/simple-build/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/frontend/src/test/scala/bloop/BaseCompileSpec.scala b/frontend/src/test/scala/bloop/BaseCompileSpec.scala index 7dba45821..326569b9d 100644 --- a/frontend/src/test/scala/bloop/BaseCompileSpec.scala +++ b/frontend/src/test/scala/bloop/BaseCompileSpec.scala @@ -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 @@ -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 @@ -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 | ^^^ diff --git a/project/Dependencies.scala b/project/Dependencies.scala index fe79825cf..660dcc007 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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" diff --git a/project/build.properties b/project/build.properties index 081fdbbc7..ee4c672cd 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1