Commit Graph

12396 Commits

Author SHA1 Message Date
Eugene Yokota ddeb5dba2c feat: Use _sbt2_3 suffix
**Problem**
The extra attribute is a vestige from the days when sbt plugins were published on Ivy repos.

**Solution**
This uses normal suffix system.
2024-09-15 15:16:10 -04:00
eugene yokota 2565b8c904
Merge pull request #7672 from eed3si9n/wip/scripted_support
[1.x] fix: Allow scripted to go through
2024-09-15 13:53:43 -04:00
Eugene Yokota 31dd85b7ba fix: Allow scripted to go through
**Problem**
Currently scripted does version checking to block sbt 2.x plugins
to be cross published from sbt 1.x.

**Solution**
Remove the sbt version matching.
2024-09-15 12:28:40 -04:00
adpi2 e3b628621f
Merge pull request #7652 from xuwei-k/ThreadDeath-1
update ErrorHandling.scala. avoid reference deprecated `ThreadDeath`
2024-09-12 16:34:26 +02:00
adpi2 f831f4dd8c Merge branch '1.10.x' into ThreadDeath-1 2024-09-12 16:06:48 +02:00
adpi2 9eebe34039
Merge pull request #7654 from adpi2/fix-ci
Fix CI: Zinc default branch is 1.10.x
2024-09-11 15:00:54 +02:00
Adrien Piquerez 4d7228ad5e Fix CI 2024-09-11 09:13:32 +02:00
kenji yoshida ee38417aff
update ErrorHandling.scala 2024-09-11 07:36:03 +09:00
eugene yokota 8ead89691f
Merge pull request #7638 from sbt/adpi2-patch-1 2024-09-03 11:30:34 -04:00
adpi2 03d5bf6e55
Fix BuildServerTest 2024-09-03 10:09:07 +02:00
adpi2 caf7e0483d
Merge pull request #7610 from SlowBrainDude/fix-stale-bsp-diagnostics
Fix stale BSP diagnostics
2024-09-02 15:36:32 +02:00
SlowBrainDude f6663a0d6c Fix stale BSP diagnostics
The BSP server didn't reset old diagnostic messages sent to BSP clients under
certain circumstances. This commit mitigates this edge case and ensures that
diagnostics for files that previously had compilation problems are properly
reset when fresh diagnostics messages are sent.

The culprit was a mismatch of map keys: Files with problems were sometimes recorded
under an absolute path, but later attempted to be retrieved by virtual path.
2024-09-02 15:27:26 +02:00
eugene yokota ee7a9aecc5
Merge pull request #7630 from jroper/package-src
Include ALL sources, and resources in source jar
2024-08-26 12:35:44 -04:00
James Roper a7481e49d0 Include ALL sources, and resources in source jar
This follows on from #7470, to include all sources, not just managed and
unmanaged, in the source jar, along with all resources (previously only
unmanaged resources were included).

This means that if, for whatever crazy reason, someone does modify the
`sources` task to include additional sources or filter out sources, rather than
using the managed or unmanaged source mechanisms, their changes will still be
reflected in the source jar.
2024-08-26 13:07:17 +10:00
eugene yokota 2f936295f1
Merge pull request #7585 from invadergir/allow-spaces-in-build-properties
Trim spaces around k and v to tolerate extra whitespace in build.properties
2024-08-08 02:22:06 -04:00
eugene yokota b639331188
Merge branch '1.10.x' into allow-spaces-in-build-properties 2024-08-08 01:01:29 -04:00
eugene yokota 2d3dacb46a
Merge pull request #7619 from eed3si9n/wip/doc-scala3
Update Scala 3 doc test
2024-08-08 01:01:12 -04:00
Eugene Yokota 7dafcd2df2 Update Scala 3 doc test
Current test depends on JCenter.
2024-08-08 00:02:49 -04:00
Eugene Yokota 860e170b6c sbt 1.10.1 2024-08-07 23:52:33 -04:00
eugene yokota d7cbd259b8
Merge branch '1.10.x' into allow-spaces-in-build-properties 2024-08-07 18:51:44 -04:00
eugene yokota d5a4382e68
Merge pull request #7605 from SlowBrainDude/use-common-scala2-version-for-sbtn 2024-07-20 11:22:04 -04:00
eugene yokota 50f6659a08
Merge pull request #7606 from SlowBrainDude/dev-doc-update 2024-07-20 11:21:15 -04:00
SlowBrainDude 242b8686e8 Note in DEV docs on supported build time JDK dependency 2024-07-20 01:20:45 +02:00
SlowBrainDude 317e991b87 Using common Scala 2.12 version for the sbtn subproject
The old, hardcoded Scala 2.12 version previously used for the sbtn
project (as a kind of workaround?) was no longer supported by Scala IDE tooling.
But sbtn builds just fine when using the current global setting for the Scala 2.12
version, so this commit removes the hardcoded version.
2024-07-19 23:30:32 +02:00
eugene yokota 1d4f7257a4
Merge pull request #7598 from eed3si9n/wip/bump_launcher
Launcher 1.4.3
2024-07-07 17:45:53 -04:00
Eugene Yokota c42766a123 Launcher 1.4.3 2024-07-07 17:23:25 -04:00
eugene yokota 334ac55c85
Merge pull request #7597 from eed3si9n/wip/bump_lm
Bump to lm 1.10.1
2024-07-07 16:30:58 -04:00
Eugene Yokota d7a0db2334 Lm 1.10.1 2024-07-07 15:50:55 -04:00
eugene yokota af127c6630
Merge pull request #7596 from eed3si9n/wip/bump_zinc
Zinc 1.10.1
2024-07-07 15:18:19 -04:00
Eugene Yokota c2009716e1 Zinc 1.10.1 2024-07-07 14:22:47 -04:00
eugene yokota 0d1dc762a7
Merge pull request #7595 from eed3si9n/wip/sjson-new
sjson-new 0.10.1
2024-07-06 17:40:55 -04:00
Eugene Yokota 70b829ec54 sbt 1.10.0 2024-07-06 16:43:13 -04:00
Eugene Yokota e32618529d Scala 2.13.14 2024-07-06 16:42:53 -04:00
Eugene Yokota a0e4d22a6c sjson-new 0.10.1 2024-07-06 16:24:28 -04:00
Michael Sesterhenn 087770f5e0 Use built-in bash string trimming instead of sed. 2024-06-21 11:21:15 -05:00
Michael Sesterhenn 678fe9d204 Trim spaces around k and v in build.properties to be more forgiving. 2024-06-20 13:07:44 -05:00
adpi2 586e0a752c
Merge pull request #7568 from adpi2/fix-bsp-internal-dep-configs
[1.10.x] Fix declaring `Optional` inter-project dependency in BSP
2024-05-23 08:50:43 +02:00
adpi2 29d6912754
Merge pull request #7567 from adpi2/backport-7538
[1.10.x] Fix `dependency-management/force-update-period` (backport of #7538)
2024-05-23 08:49:48 +02:00
Adrien Piquerez 71f996df6e Fix scripted project/internal-dependency-configuration 2024-05-22 10:25:45 +02:00
Adrien Piquerez 9a3c4a6f53 Fix dependency-management/force-update-period 2024-05-21 16:54:14 +02:00
Adrien Piquerez f990bd2d8d [BSP] Fix importing Optional project dependency 2024-05-21 15:56:37 +02:00
eugene yokota b27c7253b1
Merge pull request #7565 from sbt/dependabot/github_actions/scalacenter/sbt-dependency-submission-3
Bump scalacenter/sbt-dependency-submission from 2 to 3
2024-05-20 12:24:53 -04:00
dependabot[bot] 78296a9128
Bump scalacenter/sbt-dependency-submission from 2 to 3
Bumps [scalacenter/sbt-dependency-submission](https://github.com/scalacenter/sbt-dependency-submission) from 2 to 3.
- [Release notes](https://github.com/scalacenter/sbt-dependency-submission/releases)
- [Commits](https://github.com/scalacenter/sbt-dependency-submission/compare/v2...v3)

---
updated-dependencies:
- dependency-name: scalacenter/sbt-dependency-submission
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-20 04:22:26 +00:00
adpi2 4e46a331d9
Merge pull request #7555 from mkurz/upgrade_sbt_plugins
Upgrade sbt plugins to avoid deprecated repo.scala-sbt.org
2024-05-08 12:27:27 +02:00
Matthias Kurz c810383daf
Upgrade sbt plugins to avoid deprecated repo.scala-sbt.org 2024-05-08 11:59:00 +02:00
Eugene Yokota 0a17062645 sbt 1.10.0 2024-05-05 23:19:24 -04:00
eugene yokota d56e17b72b
Merge pull request #7551 from eed3si9n/wip/bump
Zinc 1.10.0 + universal macOS sbtn binary
2024-05-05 22:54:29 -04:00
Eugene Yokota bc4d5830e9 Banner for sbt 1.10.0 2024-05-05 22:38:05 -04:00
Eugene Yokota ae1f829f9f Include universal macOS sbtn 2024-05-05 22:34:58 -04:00
Eugene Yokota b8bb5e33fb Zinc 1.10.0 2024-05-05 20:11:32 -04:00