Commit Graph

11297 Commits

Author SHA1 Message Date
eugene yokota f18faafd1f
Merge pull request #6539 from adpi2/build-exit-notification
Close BSP channel after receiving build/exit notification
2021-06-09 19:23:27 -04:00
Adrien Piquerez cbc1c87974 Disconnect BSP server when build/exit 2021-06-09 18:01:09 +02:00
eugene yokota fabeed2227
Merge pull request #6534 from sbt/dependabot/github_actions/olafurpg/setup-scala-12
Bump olafurpg/setup-scala from 10 to 12
2021-06-07 16:58:01 -04:00
dependabot[bot] 7bf1490cbf
Bump olafurpg/setup-scala from 10 to 12
Bumps [olafurpg/setup-scala](https://github.com/olafurpg/setup-scala) from 10 to 12.
- [Release notes](https://github.com/olafurpg/setup-scala/releases)
- [Commits](https://github.com/olafurpg/setup-scala/compare/v10...v12)

---
updated-dependencies:
- dependency-name: olafurpg/setup-scala
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-07 08:12:22 +00:00
eugene yokota dda0a73281
Merge pull request #6532 from eed3si9n/wip/ipcsocket
ipcsocket 1.3.1
2021-06-05 16:17:28 -04:00
Eugene Yokota 367816ccc1 ipcsocket 1.3.1
Fixes https://github.com/sbt/sbt/issues/6531
2021-06-05 15:34:41 -04:00
eugene yokota 9e98b6daa1
Merge pull request #6529 from eed3si9n/wip/use_1.5.3
Use sbt 1.5.3
2021-06-01 11:53:39 -04:00
Eugene Yokota 2ed0574f95 Use sbt 1.5.3 2021-06-01 00:26:20 -04:00
Eugene Yokota bcda2115b1 Update the Sonatype Release URL test 2021-05-31 23:22:46 -04:00
Eugene Yokota 70a50e5c54 sbt 1.5.3 2021-05-31 23:15:07 -04:00
eugene yokota 17abe98a3a
Merge pull request #6528 from eed3si9n/wip/bump
Update modules
2021-05-31 22:33:20 -04:00
Eugene Yokota e30bd67275 Update modules 2021-05-31 22:06:59 -04:00
eugene yokota dcae3a161f
Merge pull request #6525 from sbt/dependabot/github_actions/actions/cache-2.1.6
Bump actions/cache from 2.1.5 to 2.1.6
2021-05-31 15:46:08 -04:00
dependabot[bot] a4dc402a9a
Bump actions/cache from 2.1.5 to 2.1.6
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-31 05:54:08 +00:00
eugene yokota f2f884436b
Merge pull request #6499 from pikinier20/scaladoc-scalac-options
Add missing scalac options to scaladoc task configuration
2021-05-30 22:06:32 -04:00
eugene yokota a0f22213b5
Merge pull request #6523 from eatkins/discover-main-class
Disable multiple main class warning w/ qualified key
2021-05-30 21:25:05 -04:00
Ethan Atkins 7dbf7978e9 Disable multiple main class warning w/ qualified key
If the user runs foo/runMain in a project with multiple main classes,
sbt will still warn the user about their being multiple main classes
even though this is a pointless warning since the user either is running
runMain which requires a main class. The run task is also excluded since
by default it prompts the user with a main class selector. The previous
logic for doing this filtering was bad because it only looked at the
first command in a sequence and couldn't handle the foo/runMain case
since it was looking for an exact match with `run` or `runMain`. This
commit relaxes those restrictions to look at all of the strings in the
command as well as splitting the string to check if the last part of the
key ends in run or runMain. This logic could theoretically be incorrect
if the user wrote an input task that was expecting run or runMain as
user input but even in that case the only consequence would be that they
wouldn't see the multiple main class warning which generally isn't all
the helpful unless you are packaging a jar that expects there to be only
one main class. It seems unlikely that that the user would be running a
custom input task that is both packaging a jar and expecting run or
runMain as input strings.
2021-05-30 14:48:05 -07:00
eugene yokota ea2f496f5f
Merge pull request #6522 from mkurz/scala_upgrades
Scala 2.12.14 / 2.13.6
2021-05-28 16:20:21 -04:00
Matthias Kurz ee460e0043
Upgrade semanticdb to newest version which supports Scala 2.12.14 2021-05-28 21:44:10 +02:00
Matthias Kurz 3f7193f91a
Update kind-projector 2021-05-28 18:13:28 +02:00
Matthias Kurz fbfc272171
Scala 2.12.14 / 2.13.6 2021-05-28 18:13:28 +02:00
Filip Zybała 236f419f88 Add condition preventing errors on 3.0.0. Add scripted test for running doc on Scala.js project 2021-05-27 14:56:47 +02:00
eugene yokota fdcff13804
Merge pull request #6514 from eed3si9n/wip/sbtn-download
Implement sbtn downloading
2021-05-23 17:48:03 -04:00
eugene yokota 1ae2d9d59c
Merge pull request #6517 from Nirvikalpa108/fix-nowarn
Fix @nowarn annotation in old sbt plugin style
2021-05-21 13:58:16 -04:00
Amina Adewusi 2e6fb3f2a5 Fix nowarn in both old & new sbt plugin styles
Fixes #6430.

What is the problem?
As detailed in #6430, the @nowarn annotation was not suppressing
warnings, even after the first attempt to fix this in PR#6431.

This first PR fixed the problem for projects using
enablePlugins(SbtPlugin), but not for those using sbtPlugin := true.

Why is this a valuable problem to solve?
The annotation was not working as users would expect.

What is this solution?
I have moved the scalacOptions change from SbtPlugin.projectSettings
to the scalacOptions in the JvmPlugin settings.

Has this been tested?
Yes, a test has been added. Also, this branch was tested successfully
on the twinagle repo (https://github.com/soundcloud/twinagle/pull/224).
2021-05-21 18:11:24 +01:00
Eugene Yokota 90b938e480 Implement sbtn downloading 2021-05-17 16:50:54 -04:00
eugene yokota d78683141f
Merge pull request #6511 from bjaglin/duplicated-src
dedup unmanagedSourceDirectories for Scala 3
2021-05-15 17:55:26 -04:00
Brice Jaglin 622eabfa95 dedup unmanagedSourceDirectories for Scala 3
For Scala 3, scalaBinaryVersion == epochVersion
2021-05-15 22:14:51 +02:00
eugene yokota 91704c755c
Merge pull request #6504 from adpi2/public-mkScalaInstance
Expose makeScalaInstance
2021-05-10 10:05:05 -04:00
eugene yokota 5095ea0316
Merge pull request #6505 from adpi2/apply-fix-6492
Bump to 1.5.2 + Remove forking in Test
2021-05-10 10:03:47 -04:00
Adrien Piquerez baf6678f83 Remove forking in Test 2021-05-10 11:52:51 +02:00
Adrien Piquerez ce59ea754a expose makeScalaInstance 2021-05-10 11:32:33 +02:00
Eugene Yokota b50a3ff0fe sbt 1.5.2 2021-05-09 20:26:59 -04:00
eugene yokota 8ecec5614a
Merge pull request #6502 from eed3si9n/wip/404
A quick workaround for 404
2021-05-09 19:45:43 -04:00
eugene yokota 75ebde5995
Merge pull request #6503 from eed3si9n/wip/6497
Skip zip file manipulation if the package is empty
2021-05-09 19:20:39 -04:00
Eugene Yokota fc00de02b4 A quick workaround for 404
Ref https://github.com/sbt/sbt/issues/6487
2021-05-09 19:09:41 -04:00
Eugene Yokota 25148899a1 Skip zip file manipulation if the package is empty
Fixes https://github.com/sbt/sbt/issues/6497
2021-05-09 18:55:04 -04:00
eugene yokota aa24faff50
Merge pull request #6501 from eed3si9n/wip/use1.5.1
Zinc 1.5.3
2021-05-09 02:20:47 -04:00
Eugene Yokota 3d72b6c660 Zinc 1.5.3 2021-05-09 02:00:01 -04:00
eugene yokota e1766d9a3d
Merge pull request #6500 from Nirvikalpa108/correct-client-arg
make -client the same as --client
2021-05-07 14:48:37 -04:00
Amina Adewusi f12b0baef0 make -client the same as --client
The problem was that -client was different from --client, which
makes for a confusing user experience. So, this change makes
them the same and re-names -client to --java-client. The value
of this is that hopefully -client and --client being the same
feels more logical to users.
2021-05-07 16:07:42 +01:00
Filip Zybała fcab06bd3d Add missing scalac options to scaladoc task configuration 2021-05-07 11:58:18 +02:00
eugene yokota 20395d107c
Merge pull request #6493 from adpi2/fix-6492
Add util-interface to SbtInterfaceLoader
2021-05-03 13:12:16 -04:00
eugene yokota 962db32c33
Merge pull request #6494 from rdesgroppes/remove-trailing-closing-braces
Remove trailing closing braces
2021-05-03 10:56:35 -04:00
Regis Desgroppes b8b10cdaa9 Remove trailing closing braces
Let me apologize for this typo in #6483.
2021-05-03 16:31:37 +02:00
Adrien Piquerez a07bd46cdb Add util-interface to SbtInterfaceLoader 2021-05-03 11:18:12 +02:00
eugene yokota c9e46bea3e
Merge pull request #6491 from eed3si9n/wip/use1.5.1
Use sbt 1.5.1
2021-05-03 01:11:43 -04:00
Eugene Yokota e1c29369c0 Fork mainProj
```
[error] (zincLmIntegrationProj / Test / executeTests) java.lang.LinkageError: loader constraint violation in interface itable initialization for class sbt.internal.inc.ZincComponentCompiler$ZincCompilerBridgeProvider: when selecting method 'xsbti.compile.ScalaInstance xsbti.compile.CompilerBridgeProvider.fetchScalaInstance(java.lang.String, xsbti.Logger)' the class loader sbt.internal.SbtInterfaceLoader @1224144a for super interface xsbti.compile.CompilerBridgeProvider, and the class loader sbt.internal.BottomClassLoader @52daa20b of the selected method's class, sbt.internal.inc.ZincComponentCompiler$ZincCompilerBridgeProvider have different Class objects for the type xsbti.Logger used in the signature (xsbti.compile.CompilerBridgeProvider is in unnamed module of loader sbt.internal.SbtInterfaceLoader @1224144a, parent loader sbt.internal.MetaBuildLoader$1 @6f36c2f0; sbt.internal.inc.ZincComponentCompiler$ZincCompilerBridgeProvider is in unnamed module of loader sbt.internal.BottomClassLoader @52daa20b, parent loader sbt.internal.ReverseLookupClassLoader @39b00393)
```
2021-05-02 23:51:42 -04:00
Eugene Yokota 8f80367e3c Use sbt 1.5.1 2021-05-02 23:41:55 -04:00
eugene yokota e2ae8d1182
Merge pull request #6490 from eed3si9n/wip/bump
Zinc 1.5.2
2021-05-02 23:24:20 -04:00