luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,324 Commits 29 Branches 311 Tags 69 MiB
Commit Graph

17324 Commits

Author SHA1 Message Date
Eugene Yokota cb63de6574 Merge branch '1.10.x' into wip/merge-1.10.x 2025-02-10 02:43:30 -05:00
eugene yokota da54265119
Merge pull request #8035 from eed3si9n/wip/refactor-sbtn 
[1.x] refactor: Refactor response handler
 2025-02-09 19:32:12 -05:00
Eugene Yokota a75e847a08 refactor: Refactor response handler 
**Problem**
The sbtn response handling code is relatively stragightforward,
but it's a bit messy.

**Solution**
This cleans it up a bit, similar to the style used by Unfiltered
back then (not sure how Unfiltered plans are written nowadays) by
expressing each event handling as a partial function, and composing them
together using `orElse`.
 2025-02-09 18:17:02 -05:00
Eugene Yokota 06acd261d5 Scala 2.13.16 2025-02-09 18:17:02 -05:00
eugene yokota 971991c72f
Merge pull request #8033 from eed3si9n/wip/inputtaskdyn 
[2.x] Implement Def.inputTaskDyn
 2025-02-07 20:38:57 -05:00
Adrien Piquerez 711df2cbf2 Internal usage of inputTaskDyn 2025-02-07 12:02:16 +01:00
Eugene Yokota 11cd58daa7 Implement Def.inputTaskDyn 
**Problem/Solution**
This implements Def.inputTaskDyn using Scala 3 macros.
 2025-02-05 02:04:22 -05:00
eugene yokota c99a269bfb
Merge pull request #8032 from unkarjedy/1.10.x 2025-02-04 22:13:38 -05:00
Dmitrii Naumenko a7d862a08b detect user-specific jdk installations on macOs (fixes #8031) 
User-specific JDKs are installed, for example, by IntelliJ IDEA
 2025-02-04 18:11:40 +01:00
Josh Soref 613eb86447
Spelling (#8028) 
* spelling: 1.x

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: a

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: aether

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: anymore

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: artifact

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: available

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: be

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: bridge

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: cannot

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: case-insensitive

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: checksum

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: class loads

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: contra

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: dependencies

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: dependency

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: dependent

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: deriveds

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: describes

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: early

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: enclosed

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: evaluation

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: excluding

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: execution

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: for

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: frequently

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: github

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: green

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: https://www

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: https

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: in-sourcing

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: include

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: incompatible

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: indefinitely

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: information

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: inputted

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: just

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: lastmodifiedtimes

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: latest

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: manifest

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: miscellaneous

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: more

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: neither

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: never

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: nonexistent

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: opted

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: outputting

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: params

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: performance

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: preceding

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: presentation

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: project

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: projects

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: protocol

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: related

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: representation

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: res

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: resolverlist

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: resolverset

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: response

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: returned

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: sbt_version

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: scalacheck

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: sentinels

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: separates

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: serves

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: should

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: significant

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: specifically

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: substitute

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: suppress

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: terminal

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: the

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: title

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: transitive

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: version

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: versions

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: want

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: wanting

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: whether

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* link: sbt Cached Resolution

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* link: Testing sbt plugins

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

---------

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2025-02-04 01:11:28 -05:00
eugene yokota c60142e061
Merge pull request #8029 from eed3si9n/wip/metals 
[2.x] fix: Fix semanticdbEnabled
 2025-02-02 20:02:45 -05:00
Eugene Yokota c6b7b5a061 [2.x] fix: Fix semanticdbEnabled 
**Problem**
semanticdbEnabled doesn't work on sbt 2.x
1. classes directory has changed during compilation
2. semanticdb scalacOptions are duplicated for Test

**Solution**
1. change to using the backend directory
2. reimplement scalacOptions handling
 2025-02-01 01:28:57 -05:00
eugene yokota 8d80bf5c39
Merge pull request #8024 from unkarjedy/fix-8022-updateSbtClassifiers 
[2.x] fix updateSbtClassifiers task
 2025-01-30 23:38:52 -05:00
Dmitrii Naumenko 20c1f0245f fix link to testing sbt plugins in DEVELOPING.md 2025-01-29 14:54:09 +01:00
Dmitrii Naumenko 9352e1cdad [2.x] fix: updateSbtClassifiers task fails with error (#8022) 
In `classifiersModuleTask` we now don't include the full plugin classpath, but include only the dependency classpath (effectively excluding sbt.PluginData.definitionClasspath). Only items from the dependency classpath are considered to be published. Only for them we can download classifier artifacts later in the `updateSbtClassifiers` pipeline.

This also fixes integration test "dependency-management/update-sbt-classifiers".
I also made the test stricter, it now tests the module ids that are included in the sbt classpath.
 2025-01-29 14:54:09 +01:00
eugene yokota 05a321b26a
Merge pull request #8023 from eed3si9n/wip/scripted 
[2.x] test: Bump 2.12 versions in scripted
 2025-01-29 08:14:39 -05:00
Eugene Yokota c9e696d1bf Bump 2.12 versions in scripted 
Problem/Solution
This bumps the Scala 2.12 version used in scripted tests to 2.12.20.
This also removes an old test that uses Scala 2.10.
 2025-01-29 07:02:14 -05:00
eugene yokota 58be9438f8
Merge pull request #8021 from eed3si9n/bport/8019 
[1.x] Make timing outputs consistently show hours and hint at time format
 2025-01-29 04:44:25 -05:00
Josh Soref 2ee5eb7fa7 Make timing outputs consistently show hours and hint at time format 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2025-01-29 04:20:37 -05:00
eugene yokota 4ae14cf689
Merge pull request #8020 from eed3si9n/wip/tid 2025-01-28 09:33:05 -05:00
Eugene Yokota 55b1fdeddb fix: Fix Chrome tracing file 
**Problem**
We changed the content of Chrome tracing file incorrectly
and renamed tid to tname.

**Solution**
1. This renames tname back to to tid.
2. To retain the fix to avoid Thread#getId, this calls
   either the JDK 8 way or the JDK 19 way reflectively.
 2025-01-28 04:11:36 -05:00
eugene yokota 5647bab8f3
Merge pull request #8019 from jsoref/issue-8003 
Make timing outputs consistently show hours and hint at time format
 2025-01-27 14:50:46 -05:00
Josh Soref 0493dee315 Make timing outputs consistently show hours and hint at time format 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2025-01-27 12:42:53 -05:00
eugene yokota 1b712d2c6b
Merge pull request #8013 from eed3si9n/wip/position2 2025-01-21 09:55:26 -05:00
eugene yokota a1603d9952
Merge pull request #8012 from lrytz/sip51-warn 
Add setting to allow demoting the SIP-51 build failure
 2025-01-20 18:14:21 -05:00
Lukas Rytz e46843bfd9 Add setting to allow demoting the SIP-51 build failure 
Add a `allowUnsafeScalaLibUpgrade` setting (default is `false`) to
demote the SIP-51 build failure to a warning.

If the scalaVersion is 2.13.12 but some dependency pulls in
scala-library 2.13.13, the compiler will stay at 2.13.12, but
the dependency classpath will contain scala-library 2.13.13.

This usually works, the compiler can run fine with a newer
scala-library on its dependency classpath.
Macro expansion may fail, if the macro uses some library
class / method that doesn't exist in the old version.
The macro itself is loaded from the dependency classpath
into the class loader running the compiler, where the older
Scala library is on the runtime classpath.
Using the Scala REPL in sbt may also fail in a similar fashion.
 2025-01-20 10:00:13 +01:00
Eugene Yokota 4a7e1097d9 fix: Fix build.sbt position 
**Problem**
Compiler warnings and errors is not correct for build.sbt.

**Solution**
This adds line offset to the synthetic Scala file
so the original line position is displayed in the errors.
 2025-01-20 01:35:54 -05:00
eugene yokota 2323250b01
Merge pull request #8011 from xuwei-k/Scala-3-6-3 2025-01-16 09:00:14 -05:00
xuwei-k b481e0a0b6 Scala 3.6.3 2025-01-16 19:47:01 +09:00
eugene yokota e2acec57b7
Merge pull request #8006 from eed3si9n/wip/run 2025-01-13 08:37:50 -05:00
eugene yokota 873f8b1261
Merge branch 'develop' into wip/run 2025-01-12 18:05:11 -05:00
eugene yokota 2f53aa9991
Merge pull request #8007 from eed3si9n/wip/refactor-main-loop 
[2.x] refactor: Refactor MainLoop.scala
 2025-01-12 18:00:20 -05:00
Eugene Yokota 08fcea4c77 refactor: Refactor MainLoop.scala 
**Problem/Solution**
This refactors MainLoop.scala.
 2025-01-12 03:03:03 -05:00
Eugene Yokota cd09003583 fix: Fix sbtn not showing run 
**Problem**
Currently sbtn doesn't correctly display the stdout
during `run` because by the time it starts the terminal has been reset.

**Solution**
Don't reset the terminal in-between the tasks.
 2025-01-12 02:24:23 -05:00
Eugene Yokota bcad9f6887 fix: Fix run getting stuck 
**Problem**
When the run ends too quickly it gets stuck.

**Solution**
This doesn't pause the channel if the job is already done.
 2025-01-12 01:30:12 -05:00
eugene yokota d99163b945
Merge pull request #8005 from dwickern/fix-npe 
Fix race condition in NetworkChannel
 2025-01-11 22:26:21 -05:00
Derek Wickern f0afda3dd0 make NetworkChannel#thread private 2025-01-11 13:08:18 -08:00
Derek Wickern a13bfd3ef9 fix race condition in NetworkChannel 2025-01-11 12:46:35 -08:00
eugene yokota 07378b4a69
Merge pull request #7819 from xuwei-k/ControlEvent-Enumeration 
[2.x] use `enum` instead of `scala.Enumeration` in `scala.util.LogEvent`
 2025-01-05 18:25:37 -05:00
eugene yokota a09a724b06
Merge branch 'develop' into ControlEvent-Enumeration 2025-01-05 17:04:57 -05:00
eugene yokota 0662649598
Merge pull request #8001 from xuwei-k/withFilter 
use `withFilter` instead of `filter`
 2025-01-05 05:17:14 -05:00
xuwei-k da26f3078b use withFilter instead of filter 2025-01-04 09:10:36 +09:00
eugene yokota 43ceda68b6
Merge pull request #8000 from eed3si9n/wip/io 
[2.x] IO 1.10.4
 2025-01-03 13:37:18 -05:00
Eugene Yokota 0fa3ed57c1 IO 1.10.4 2025-01-03 05:27:58 -05:00
xuwei-k 358f2d9fdc use enum instead of scala.Enumeration 2025-01-03 12:07:41 +09:00
eugene yokota 7f86575314
Merge pull request #7999 from xuwei-k/remove-unused-privates 2025-01-02 05:31:56 -05:00
eugene yokota 79a75bf23b
Merge pull request #7998 from xuwei-k/typo 2025-01-02 05:30:43 -05:00
xuwei-k 614d9ce985 remove unused private val and def 2025-01-02 18:48:32 +09:00
xuwei-k 0d0cd2eabf fix typo 2025-01-02 13:52:51 +09:00
eugene yokota 52d36653da
Merge pull request #7997 from xuwei-k/scalafmt-convertToNewSyntax 
[2.x] update `.scalafmt.conf`. enforce new scala 3 syntax
 2025-01-01 22:34:03 -05:00