Skip to content

Commit c76f3e4

Browse files
Merge pull request #62 from alexarchambault/merge-upstream
Merge upstream changes
2 parents 8c9f309 + e01cdb5 commit c76f3e4

File tree

2 files changed

+91
-20
lines changed

2 files changed

+91
-20
lines changed

notes/v1.5.0.md

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# bloop `v1.5.0`
2+
3+
Bloop v1.5.0 is out! The main change in this release is migration to the newest
4+
version of the Zinc incremental compiler. We also discontinued using
5+
`~/.bloop/.jvmopts` to specify Bloop jvm opts, instead users should use
6+
`~/.bloop/bloop.json` as explained in
7+
[the documentation](https://scalacenter.github.io/bloop/docs/server-reference#global-settings-for-the-server)
8+
9+
## Installing Bloop
10+
11+
For more details about installing Bloop, please see
12+
[Bloop's Installation Guide](https://scalacenter.github.io/bloop/setup))
13+
14+
## Merged pull requests
15+
16+
Here's a list of pull requests that were merged:
17+
18+
- Switch to dev.dirs org for directories and update to newest one [#1723]
19+
- Update directories dependency to 12 [#1722]
20+
- Ci: break CI actions into smaller pieces [#1706]
21+
- Fix duplicate compiler classpath and bootclasspath options [#1721]
22+
- Feat: publish Gradle plugin for 2.13 [#1717]
23+
- Fix: prevent ignorance of initial changes [#1720]
24+
- Fix: stabilize test project resources generation [#1715]
25+
- Build(deps): bump actions/cache from 2 to 3.0.1 [#1711]
26+
- Fix: sbt-bloop - add cause to error log if bloopGenerate fails [#1714]
27+
- Build(deps): bump minimist from 1.2.5 to 1.2.6 in /website [#1712]
28+
- Build(deps): bump actions/download-artifact from 2.1.0 to 3 [#1709]
29+
- Fix: move resource generation out from onLoad [#1708]
30+
- Build(deps): bump actions/checkout from 2.4.0 to 3 [#1710]
31+
- Remove the possibility to read proeprties from.jvmopts [#1707]
32+
- Chore: add scalafix [#1700]
33+
- Implement buildTarget/inverseSources BSP endpoint [#1704]
34+
- Fix: update BloopBspServices.scala [#1703]
35+
- Fixing typo in README.md [#1702]
36+
- Fix copying tasty files on incremental compilation [#1701]
37+
- Feat: adjust scala test classes bsp endpoint [#1695]
38+
- Chore: adjust scala test suites to sbt's implementation. [#1699]
39+
- Build(deps): bump actions/setup-node from 2.5.1 to 3 [#1698]
40+
- Chore: bump sbt version [#1679]
41+
- Build(deps): bump url-parse from 1.5.7 to 1.5.10 in /website [#1697]
42+
- Build(deps): bump prismjs from 1.25.0 to 1.27.0 in /website [#1696]
43+
- Add proper output option for the forked Java compiler [#1694]
44+
- Fix: remove benchmark step from CI [#1692]
45+
- Rename terms according to the Scala language guide [#1688]
46+
- Fix upload artifacts version [#1690]
47+
- Switch primary branch to main [#1687]
48+
- Fix timeouts on Windows tests [#1686]
49+
- Update Zinc to 1.6.0 and drop the fork [#1662]
50+
- Build(deps): bump url-parse from 1.5.3 to 1.5.7 in /website [#1684]
51+
52+
[#1723]: https://github.com/scalacenter/bloop/pull/1723
53+
[#1722]: https://github.com/scalacenter/bloop/pull/1722
54+
[#1706]: https://github.com/scalacenter/bloop/pull/1706
55+
[#1721]: https://github.com/scalacenter/bloop/pull/1721
56+
[#1717]: https://github.com/scalacenter/bloop/pull/1717
57+
[#1720]: https://github.com/scalacenter/bloop/pull/1720
58+
[#1715]: https://github.com/scalacenter/bloop/pull/1715
59+
[#1711]: https://github.com/scalacenter/bloop/pull/1711
60+
[#1714]: https://github.com/scalacenter/bloop/pull/1714
61+
[#1712]: https://github.com/scalacenter/bloop/pull/1712
62+
[#1709]: https://github.com/scalacenter/bloop/pull/1709
63+
[#1708]: https://github.com/scalacenter/bloop/pull/1708
64+
[#1710]: https://github.com/scalacenter/bloop/pull/1710
65+
[#1707]: https://github.com/scalacenter/bloop/pull/1707
66+
[#1700]: https://github.com/scalacenter/bloop/pull/1700
67+
[#1704]: https://github.com/scalacenter/bloop/pull/1704
68+
[#1703]: https://github.com/scalacenter/bloop/pull/1703
69+
[#1702]: https://github.com/scalacenter/bloop/pull/1702
70+
[#1701]: https://github.com/scalacenter/bloop/pull/1701
71+
[#1695]: https://github.com/scalacenter/bloop/pull/1695
72+
[#1699]: https://github.com/scalacenter/bloop/pull/1699
73+
[#1698]: https://github.com/scalacenter/bloop/pull/1698
74+
[#1679]: https://github.com/scalacenter/bloop/pull/1679
75+
[#1697]: https://github.com/scalacenter/bloop/pull/1697
76+
[#1696]: https://github.com/scalacenter/bloop/pull/1696
77+
[#1694]: https://github.com/scalacenter/bloop/pull/1694
78+
[#1692]: https://github.com/scalacenter/bloop/pull/1692
79+
[#1688]: https://github.com/scalacenter/bloop/pull/1688
80+
[#1690]: https://github.com/scalacenter/bloop/pull/1690
81+
[#1687]: https://github.com/scalacenter/bloop/pull/1687
82+
[#1686]: https://github.com/scalacenter/bloop/pull/1686
83+
[#1662]: https://github.com/scalacenter/bloop/pull/1662
84+
[#1684]: https://github.com/scalacenter/bloop/pull/1684
85+
86+
## Contributors
87+
88+
According to `git shortlog -sn --no-merges v1.4.13..v1.5.0`, the following
89+
people have contributed to this `v1.5.0` release: Kamil Podsiadlo, Tomasz
90+
Godzik, dependabot[bot], Vadim Chelyshov, James Yoo, Martin
91+
Duhem.

project/Dependencies.scala

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,15 @@ object Dependencies {
1111
val javaDebugVersion = "0.21.0+1-7f1080f1"
1212

1313
val scalazVersion = "7.2.20"
14-
val scalaXmlVersion = "1.2.0"
1514
val lmVersion = "1.0.0"
16-
val configDirsVersion = "10"
1715
val caseAppVersion = "2.0.6"
1816
val sourcecodeVersion = "0.1.4"
1917
val sbtTestInterfaceVersion = "1.0"
2018
val sbtTestAgentVersion = "1.4.4"
2119
val junitVersion = "0.13.3"
22-
val graphvizVersion = "0.2.2"
2320
val directoryWatcherVersion = "0.8.0+6-f651bd93"
24-
val mavenApiVersion = "3.6.1"
25-
val mavenAnnotationsVersion = "3.5"
26-
val mavenScalaPluginVersion = "4.5.3"
27-
val groovyVersion = "2.5.4"
28-
val gradleAndroidPluginVersion = "4.2.0"
29-
val ipcsocketVersion = "1.0.1"
3021
val monixVersion = "2.3.3"
31-
val circeVersion = "0.9.3"
3222
val jsoniterVersion = "2.4.0"
33-
val circeVersion213 = "0.12.2"
3423
val shapelessVersion = "2.3.4"
3524
val scalaNative04Version = "0.4.0"
3625
val scalaJs06Version = "0.6.32"
@@ -41,7 +30,6 @@ object Dependencies {
4130
val difflibVersion = "1.3.0"
4231
val braveVersion = "5.6.1"
4332
val zipkinSenderVersion = "2.7.15"
44-
val jnaVersion = "5.8.0"
4533
val asmVersion = "7.0"
4634
val snailgunVersion = "0.4.0"
4735
val ztExecVersion = "1.11"
@@ -85,9 +73,6 @@ object Dependencies {
8573
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % jsoniterVersion
8674
val jsoniterMacros =
8775
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % jsoniterVersion
88-
val circeParser = "io.circe" %% "circe-parser" % circeVersion
89-
val circeCore = "io.circe" %% "circe-core" % circeVersion
90-
val circeGeneric = "io.circe" %% "circe-generic" % circeVersion
9176
val scalaDebugAdapter = "ch.epfl.scala" %% "scala-debug-adapter" % debugAdapterVersion
9277

9378
val scalaNativeTools04 = "org.scala-native" %% "tools" % scalaNative04Version % Provided
@@ -104,17 +89,12 @@ object Dependencies {
10489
"org.scala-js" %% "scalajs-sbt-test-adapter" % scalaJs1Version % Provided
10590
val scalaJsLogging1 = "org.scala-js" %% "scalajs-logging" % "1.1.1" % Provided
10691

107-
val classgraph = "io.github.classgraph" % "classgraph" % "4.8.78"
108-
10992
val xxHashLibrary = "net.jpountz.lz4" % "lz4" % xxHashVersion
11093
val zt = "org.zeroturnaround" % "zt-zip" % ztVersion
11194

11295
val brave = "io.zipkin.brave" % "brave" % braveVersion
11396
val zipkinSender = "io.zipkin.reporter2" % "zipkin-sender-urlconnection" % zipkinSenderVersion
114-
val zipkinOkHttp = "io.zipkin.reporter2" % "zipkin-sender-okhttp3" % zipkinSenderVersion
11597

116-
val jna = "net.java.dev.jna" % "jna" % jnaVersion
117-
val jnaPlatform = "net.java.dev.jna" % "jna-platform" % jnaVersion
11898
val asm = "org.ow2.asm" % "asm" % asmVersion
11999
val asmUtil = "org.ow2.asm" % "asm-util" % asmVersion
120100

0 commit comments

Comments
 (0)