Merge remote-tracking branch 'upstream/master' into master

Author: alexarchambault

docs/build-tools/sbt.md

@@ -88,9 +88,9 @@ Here's a list of bloop commands you can run next to start playing with bloop:
 
 ## Next steps after installation
 
-Use an IDE such as [Metals](docs/ides/metals) or
-[IntelliJ](docs/ides/intellij) to write code or play with the
-[CLI](docs/cli/tutorial) if you want to explore what CLI options are
+Use an IDE such as [Metals](/bloop/docs/ides/metals) or
+[IntelliJ](/bloop/docs/ides/intellij) to write code or play with the
+[CLI](/bloop/docs/cli/tutorial) if you want to explore what CLI options are
 available.
 
 If you need help, you can always come over to our [Discord

frontend/src/main/scala/bloop/data/Project.scala

@@ -251,8 +251,15 @@ final case class Project(
           getJavaVersionFromJavaHome(f.javaHome)
       )
       .getOrElse(Properties.javaVersion)
-
-    compareVersions(compileVersion, version) >= 0
+      .split("-")
+      .head // needed for versions like 17-ea
+    try {
+      compareVersions(compileVersion, version) >= 0
+    } catch {
+      case NonFatal(_) =>
+        logger.error(s"Invalid Java number $compileVersion")
+        false
+    }
   }
 }
 

frontend/src/test/scala/bloop/dap/DebugAdapterConnection.scala

@@ -152,7 +152,7 @@ private[dap] final class DebugAdapterConnection(
 object DebugAdapterConnection {
   def connectTo(uri: URI)(scheduler: Scheduler): DebugAdapterConnection = {
     val socket = new Socket()
-    socket.connect(new InetSocketAddress(uri.getHost, uri.getPort), 500)
+    socket.connect(new InetSocketAddress(uri.getHost, uri.getPort), 10000)
 
     val proxy = DebugAdapterProxy(socket)
     proxy.startBackgroundListening(scheduler)

frontend/src/test/scala/bloop/dap/DebugServerSpec.scala

@@ -478,7 +478,7 @@ object DebugServerSpec extends DebugBspBaseSuite {
         assert(debuggeeCanceled, serverClosed)
       }
 
-      TestUtil.await(FiniteDuration(5, SECONDS), ExecutionContext.ioScheduler)(test)
+      TestUtil.await(FiniteDuration(20, SECONDS), ExecutionContext.ioScheduler)(test)
     }
   }
 

notes/v1.4.12.md

@@ -0,0 +1,66 @@
+# bloop `v1.4.12`
+
+Bloop v1.4.12 is a bugfix release.
+
+## Installing Bloop
+
+For more details about installing Bloop, please see [Bloop's Installation Guide](https://scalacenter.github.io/bloop/setup))
+
+## Merged pull requests
+
+Here's a list of pull requests that were merged:
+
+- CompierCache - fix patmat [#1653]
+- Add tests for Scala version 2.13.8 [#1629]
+- Fork JavaCompiler in case if there are `-J` flags [#1652]
+- Launcher 213 [#1646]
+- Fix gradle211 compilation errors [#1645]
+- [Java] Don't pass `--add-export` semanticdb flags to jdk8 [#1647]
+- Bump actions/download-artifact from 2.0.10 to 2.1.0 [#1640]
+- Bump actions/setup-node from 2.5.0 to 2.5.1 [#1639]
+- Fix JS compilation errors [#1638]
+- [Maven] Make sure correct classifier is used when downloading artifacts. [#1634]
+- Fix fish completions error [#1633]
+- Fix typo in discord URL [#1628]
+- Update sbt to 1.4.9 and remove offloading [#1623]
+- Handle gradle project-sourceset name clashes [#1625]
+- Add exports for Semanticdb plugin on Java 17 [#1622]
+- Send TestResult to Debugee Listener [#1607]
+- Ignore hydra tests [#1619]
+- Fix regex used for HydraCompileSpec [#1618]
+- Ignore Hydra license output in tests [#1617]
+- Bump actions/checkout from 2.3.5 to 2.4.0 [#1616]
+- Bump actions/setup-node from 2.4.1 to 2.5.0 [#1615]
+- Clean-up [#1610]
+- Use coursier-interface rather than coursier [#1612]
+
+
+[#1653]: https://github.com/scalacenter/bloop/pull/1653
+[#1629]: https://github.com/scalacenter/bloop/pull/1629
+[#1652]: https://github.com/scalacenter/bloop/pull/1652
+[#1646]: https://github.com/scalacenter/bloop/pull/1646
+[#1645]: https://github.com/scalacenter/bloop/pull/1645
+[#1647]: https://github.com/scalacenter/bloop/pull/1647
+[#1640]: https://github.com/scalacenter/bloop/pull/1640
+[#1639]: https://github.com/scalacenter/bloop/pull/1639
+[#1638]: https://github.com/scalacenter/bloop/pull/1638
+[#1634]: https://github.com/scalacenter/bloop/pull/1634
+[#1633]: https://github.com/scalacenter/bloop/pull/1633
+[#1628]: https://github.com/scalacenter/bloop/pull/1628
+[#1623]: https://github.com/scalacenter/bloop/pull/1623
+[#1625]: https://github.com/scalacenter/bloop/pull/1625
+[#1622]: https://github.com/scalacenter/bloop/pull/1622
+[#1607]: https://github.com/scalacenter/bloop/pull/1607
+[#1619]: https://github.com/scalacenter/bloop/pull/1619
+[#1618]: https://github.com/scalacenter/bloop/pull/1618
+[#1617]: https://github.com/scalacenter/bloop/pull/1617
+[#1616]: https://github.com/scalacenter/bloop/pull/1616
+[#1615]: https://github.com/scalacenter/bloop/pull/1615
+[#1610]: https://github.com/scalacenter/bloop/pull/1610
+[#1612]: https://github.com/scalacenter/bloop/pull/1612
+
+
+## Contributors
+
+According to `git shortlog -sn --no-merges v1.4.11..v1.4.12`, the following people have contributed to
+this `v1.4.12` release: Kamil Podsiadlo, Tomasz Godzik, dependabot[bot], Vadim Chelyshov, Alexander Anohin, Alexandre Archambault, Arthur McGibbon.

website/yarn.lock

@@ -1159,9 +1159,9 @@ babylon@^6.18.0:
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-js@^1.0.2:
   version "1.3.1"
@@ -2952,7 +2952,19 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@~7.1.1:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -3393,9 +3405,9 @@ [email protected]:
     through "^2.3.6"
 
 interpret@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
-  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 into-stream@^3.1.0:
   version "3.1.0"
@@ -3480,6 +3492,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.8.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4709,7 +4728,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.6:
+path-parse@^1.0.6, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -5498,7 +5517,16 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2:
+resolve@^1.1.6:
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"
+  integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==
+  dependencies:
+    is-core-module "^2.8.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.10.0, resolve@^1.3.2:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -5692,9 +5720,9 @@ [email protected]:
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
 shelljs@^0.8.3:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
-  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
+  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -6069,6 +6097,11 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 svgo@^1.0.0, svgo@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"