Commit Graph

11274 Commits

Author SHA1 Message Date
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
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
Eugene Yokota 9cc61015d7 Zinc 1.5.2 2021-05-02 21:56:25 -04:00
eugene yokota 9b6d4b5390
Merge pull request #6488 from eed3si9n/wip/new
Fix new command leaving behind target, take 2
2021-05-02 21:52:44 -04:00
eugene yokota 934c150aae
Merge pull request #6489 from eed3si9n/wip/remove_test
Remove a scripted test that uses Bintray
2021-05-02 21:52:28 -04:00
eugene yokota 2e49170552
Merge pull request #6483 from rdesgroppes/favor-jvm-user-home
sbt script: Favor java's `user.home` over `$HOME`
2021-05-02 21:03:45 -04:00
Eugene Yokota 56c1a0598c Remove a scripted test that uses Bintray 2021-05-02 21:02:23 -04:00
eugene yokota ccca321a0f
Merge pull request #6481 from adpi2/backport-mk-scala-instance
Backport #6480: Expose makeScalaInstance publicly
2021-05-02 20:50:46 -04:00
Eugene Yokota 1c8b55107d Fix new command leaving behind target, take 2
Fixes #2835

Somehow the fix in #4033 due to various initialization.
Here's a bit more aggressive rebasing of the base directory
that should fix the `project` and `target` directory created during sbt
new.
2021-05-02 20:48:10 -04:00
Regis Desgroppes 45d59ab259 sbt script: Favor java's `user.home` over `$HOME`
JVM powered applications may be given an alternate home by means of the
`user.home` system property, which is handy for managing caches in CI
(the property may be set by different means, including environment
variables such as `JAVA_TOOL_OPTIONS` or `_JAVA_OPTIONS`).

Alas, this doesn't fully work when the `sbt` script downloads the
launcher jar to `$HOME`.

The present change consists in retrieving the value of this property by
means of a `findProperty` function extracted from the existing
`getPreloaded` one (adapted accordingly).

No java process get spawned here.
2021-05-02 22:32:35 +02:00
Adrien Piquerez ded074ac75 Expose Defaults.makeScalaInstance 2021-05-01 20:29:42 +02:00
eugene yokota 9a5891a779
Merge pull request #6484 from Nirvikalpa108/fix-dependency-graph-tests
Fixes failing tests
2021-04-30 12:13:54 -04:00
Amina Adewusi b27ea623a5 Fixes failing tests
Tests were failing because of bintray migration. Lightbend forgot
to move dependencies. This fixes it by upgrading to more modern
library dependencies.
2021-04-30 16:37:07 +01:00
eugene yokota 40870d3fa8
Merge pull request #6469 from Nirvikalpa108/improve-documentation 2021-04-26 09:41:45 -04:00
Amina Adewusi 5f16f6aace add additional instructions for new contributors 2021-04-26 08:48:29 +01:00
Eugene Yokota 3ef1c5508b scalafmtSbt 2021-04-25 23:15:16 -04:00
Eugene Yokota 19bce2874c Downgrade to sbt 1.4.9 until mima issue is addressed 2021-04-25 22:59:57 -04:00
Eugene Yokota 00312d7674 name in Windows 2021-04-25 22:58:34 -04:00
Eugene Yokota 6228cee742 Windows package name 2021-04-25 22:51:40 -04:00
Eugene Yokota 43b2f1eb30 sbt 1.5.1 2021-04-25 22:16:01 -04:00
eugene yokota 6581896dd4
Merge pull request #6467 from eed3si9n/wip/bump
Launcher 1.3.1
2021-04-25 19:41:29 -04:00
Eugene Yokota 0c61f7560a Launcher 1.3.1 2021-04-25 18:55:27 -04:00
eugene yokota ace53d81a9
Merge pull request #6464 from eed3si9n/wip/linux2
Fix Debian releasing
2021-04-25 01:27:18 -04:00
Eugene Yokota 8f0d258439 Fix Debian releasing
Add `deb.distribution=all;deb.component=main;deb.architecture=all`
2021-04-25 01:23:15 -04:00
Eugene Yokota 8347a0bb09 Fix Linux package layout 2021-04-24 20:26:18 -04:00