Commit Graph

12585 Commits

Author SHA1 Message Date
eugene yokota 3c645bbeeb
Merge pull request #7688 from eed3si9n/wip/non-blocking-run
[2.x] feat: Non-blocking run
2024-10-01 16:47:26 -04:00
Eugene Yokota 8aa740574b Move suspendChannel to EvaluateTask 2024-10-01 03:15:28 -04:00
eugene yokota 683b09afa8
Update main/src/main/scala/sbt/internal/DefaultBackgroundJobService.scala
Co-authored-by: adpi2 <adrien.piquerez@gmail.com>
2024-10-01 00:46:52 -04:00
adpi2 a4ef38c5da
Merge pull request #7708 from adpi2/2.x-fix-7706
[2.x] Fix loading of `ScalaJSPlugin` in `ProjectMatrix`
2024-09-30 15:06:34 +02:00
eugene yokota 33fd849e3c
Merge pull request #7703 from eed3si9n/wip/remove-old-build-sbt-dsl 2024-09-30 09:01:35 -04:00
adpi2 254ff06b6b
Merge branch 'develop' into 2.x-fix-7706 2024-09-30 14:06:23 +02:00
Adrien Piquerez be04ad552d Use projectMatrix caller to resolve plugins 2024-09-30 14:01:46 +02:00
Adrien Piquerez 56416901cf Add back `dependsOn` on inputTask 2024-09-30 14:00:08 +02:00
Eugene Yokota 5684a842c3 refactor: Remove sbt 0.13 `in` methods
**Problem**
See https://www.scala-sbt.org/1.x/docs/Migrating-from-sbt-013x.html#Migrating+to+slash+syntax

We should remove `scalacOptions in (Compile, console)` notation. This was deprecated in https://eed3si9n.com/sbt-1.5.0.

**Solution**
This renames `in` to `rescope` for internal usage, and ports the usages to slash.
2024-09-28 19:19:58 -04:00
eugene yokota 1ceef86eb2
Merge pull request #7700 from eed3si9n/wip/remove-old-shell-syntax
[2.x] refactor: Remove old sbt 0.13 shell syntax
2024-09-28 18:50:20 -04:00
Eugene Yokota a6b4cfef12 refactor: Remove old sbt 0.13 shell syntax 2024-09-28 13:51:14 -04:00
eugene yokota 5ffd2f20c3
Merge pull request #7694 from eed3si9n/wip/cross-building
[2.x] feat: plugin cross building as Scala cross building
2024-09-27 00:50:21 -04:00
adpi2 aa280837c0
Merge branch 'develop' into wip/cross-building 2024-09-26 14:15:05 +02:00
adpi2 1a4cdf4862
Merge pull request #7697 from adpi2/2.x-source-compat
[2.x] Improve backward source compat
2024-09-26 09:28:26 +02:00
eugene yokota b5d3a6d258
Merge pull request #7693 from eed3si9n/wip/common-settings
[2.x] fix: Fix common settings loading when root is synthetic
2024-09-25 11:56:41 -04:00
Adrien Piquerez 0728a5b5ad Add default imports 2024-09-25 16:43:45 +02:00
Adrien Piquerez eda3a87e76 Resolve conflict between BuildSyntax.dependsOn and Scoped.dependsOn 2024-09-25 16:43:45 +02:00
Adrien Piquerez 860f462f2f Add dependsOn on Initialize[Task[A]] 2024-09-25 15:32:04 +02:00
Adrien Piquerez edd11a283e Make Classpaths.analyzed public 2024-09-25 15:32:04 +02:00
Eugene Yokota 01d5f9c050 feat: plugin cross building as Scala cross building
**Problem**
Since Scala cross building works better than the plugin cross building `^^`,
it was common for plugin authors to encode plugin cross building as Scala cross building
given that we usually have zero or one sbt release in one Scala version.

**Solution**
This brings in the setting into SbtPlugin so plugin authors can cross build
using sbt 2.x.
2024-09-22 17:25:08 -04:00
Eugene Yokota 354dd25988 fix: Fix common settings loading when root is synthetic
**Problem**
The new common settings feature doesn't work when the root isn't created by the user.

**Solution**
This fixes common settings by calling `expandCommonSettingsPerBase(...)` on
the synthetic root's base first.
2024-09-22 16:51:10 -04:00
eugene yokota 864da879c6
Merge pull request #7691 from eed3si9n/wip/root_skip_publish
[2.x] fix: skip publish on synthetic aggregate root
2024-09-22 15:48:39 -04:00
eugene yokota d7185c9c52
Merge pull request #7689 from eed3si9n/wip/matrix_followup
[2.x] Make Scala 3 the default axis of the projectMatrix, not 2.13
2024-09-22 13:18:57 -04:00
eugene yokota 7d1868ec64
Merge pull request #7692 from eed3si9n/wip/remove-build-properties-from-scripted
[2.x] fix: Remove build.properties from a scripted
2024-09-22 12:27:01 -04:00
Eugene Yokota 6ce8f34cbe fix: Remove build.properties from a scripted
**Problem**
build.properties hardcodes sbt version.

**Solution**
This can be removed.
2024-09-22 10:23:09 -04:00
eugene yokota 39e5a1f7eb
Merge branch 'develop' into wip/root_skip_publish 2024-09-22 01:00:03 -04:00
eugene yokota 4ff0477e1e
Merge branch 'develop' into wip/matrix_followup 2024-09-22 00:59:36 -04:00
Eugene Yokota 6491e50449 fix: skip publish on synthetic aggregate root
**Problem**
There's been previous attempt like 1878 to skip publishing of the root,
but it seems like the behavior has regressed at some point in time.

**Solution**
This skips publishing on synthetic aggregate root project.
2024-09-22 00:53:10 -04:00
Eugene Yokota fb4b433db3 Make Scala 3 the default axis, instead of 2.13 2024-09-21 22:40:19 -04:00
Eugene Yokota 1f71332edc runBlock 2024-09-21 01:26:57 -04:00
eugene yokota d2be0447f2
Merge pull request #7686 from eed3si9n/wip/test-quick
[2.x] feat: Rename testQuick to test
2024-09-21 00:39:07 -04:00
Eugene Yokota c37b7a1555 feat: Non-blocking run
**Problem**
`run` currently blocks all other commands, such as BSP commands.

**Solution**
`run` no longer blocks the command execution loop.
Instead it pauses the prompt on the current command channel.
2024-09-20 04:00:03 -04:00
Eugene Yokota 2a3ea0837b feat: Rename testQuick to test
**Problem**
We have incremental testing, but it's not used by default.

**Solution**
This renames testQuick to test, and test to testFull.
2024-09-18 22:57:47 -04:00
adpi2 336b752c4f
Merge pull request #7682 from adpi2/2.x-fix-scripted-cache
[2.x] Fix scripted cache tests
2024-09-18 12:00:45 +02:00
Adrien Piquerez f08f272d23 [2.x] Fix scripted cache tests 2024-09-18 10:28:11 +02:00
eugene yokota 733b526ac5
Merge pull request #7681 from adpi2/sbt-projectmatrix
[2.x] Merge sbt-projectmatrix
2024-09-17 18:28:35 -04:00
eugene yokota 97823b18b0
[2.x] fix: Invalidate testQuick on test argument changes (#7680)
**Problem**
testQuick currently does not invalidate on argument changes.

**Solution**
This includes test argument digests.

---------

Co-authored-by: adpi2 <adrien.piquerez@gmail.com>
2024-09-17 17:48:53 -04:00
adpi2 6a2c4e56ea
Merge branch 'develop' into sbt-projectmatrix 2024-09-17 17:03:20 +02:00
Adrien Piquerez b59856bcba Merge sbt-projectmatrix 2024-09-17 17:02:30 +02:00
Adrien Piquerez 7c01636efa Move sources from sbt-projectmatrix 2024-09-17 17:00:04 +02:00
Adrien Piquerez 6da4790671 Format 2024-09-17 16:54:34 +02:00
Adrien Piquerez 3dcc6cfcd1 Merge branch 'develop' of ../sbt-projectmatrix into sbt-projectmatrix 2024-09-17 16:54:18 +02:00
eugene yokota cb9a455915
Merge pull request #7676 from eed3si9n/wip/invalidate-on-resource
[2.x] fix: Invalidate testQuick on resource file changes
2024-09-17 10:26:15 -04:00
eugene yokota a68984b877
Merge pull request #7679 from eed3si9n/fport/sbt-cross-publishing
[2.x] feat: Use _sbt2_3 suffix
2024-09-16 02:02:05 -04:00
eugene yokota ac0edfc6bb
Merge pull request #7677 from eed3si9n/wip/delete-ivy-test
[2.x] refactor: Delete Ivy-related test
2024-09-16 01:08:48 -04:00
Eugene Yokota 683bece1c4 Use sbt 1.10.2 2024-09-16 00:53:01 -04:00
Eugene Yokota 803e575b8a 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-16 00:51:00 -04:00
Eugene Yokota 86a60583a3 refactor: Delete Ivy-related test 2024-09-15 18:29:40 -04:00
Eugene Yokota c13c25fdff fix: Invalidate testQuick on resource file changes
**Problem**
testQuick currently does not invalidate on resource file changes.

**Solution**
This includes resource digests into the input.
2024-09-15 18:13:56 -04:00
eugene yokota 2cb36bcaa8
[2.x] fix: fallback to file copy (#7668)
**Problem**
Disk cache currently uses symbolic links, which won't
work on Windows without the Administrator privileges or
Developer Mode.

**Solution**
This falls back to using file copy.
2024-09-15 13:03:07 -04:00