luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,086 Commits 22 Branches 334 Tags 97 MiB
Commit Graph

18086 Commits

Author SHA1 Message Date
eugene yokota 8fe6e4e876
Merge pull request #7548 from szeiger/wip/fix-string-logging 
Fix logging of raw strings
 2024-05-04 22:34:41 -07:00
eugene yokota 26cdfa8b0f
Merge branch '1.10.x' into wip/fix-string-logging 2024-05-04 22:19:44 -07:00
eugene yokota 1c7c62135b
Merge pull request #7549 from eed3si9n/wip/mac 
Fix CI
 2024-05-04 22:19:21 -07:00
Eugene Yokota a6bdf9dc2e Fix CI 
It seems like the latest macOS image no longer supports JDK 8.
 2024-05-05 01:02:19 -04:00
Stefan Zeiger da79479ff7 Fix logging of raw strings 
sbt passes raw string messages in `ConsoleAppenderFromLog4J` to `StringFormatterMessageFactory`. This is wrong because these strings are pre-formatted and should not be processed again for formatting. There is no way to pass parameters to them anyway. This causes problems when the raw strings contain characters that `StringFormatterMessageFactory` wants to interpret.

For example, when using `-Ystatistics`:

```
ERROR StatusConsoleListener Unable to format msg:   nscprofiling                : 1 spans, ()7.543ms (0.3%)
java.util.UnknownFormatConversionException: Conversion = ')'
at java.base/java.util.Formatter.checkText(Formatter.java:2732)
at java.base/java.util.Formatter.parse(Formatter.java:2718)
at java.base/java.util.Formatter.format(Formatter.java:2655)
at java.base/java.util.Formatter.format(Formatter.java:2609)
at java.base/java.lang.String.format(String.java:2938)
at org.apache.logging.log4j.message.StringFormattedMessage.formatMessage(StringFormattedMessage.java:121)
at org.apache.logging.log4j.message.StringFormattedMessage.getFormattedMessage(StringFormattedMessage.java:89)
at sbt.internal.util.Appender.$anonfun$appendMessage$1(ConsoleAppender.scala:522)
...
```
 2024-05-02 18:31:23 +02:00
adpi2 01d009d354
Merge pull request #7539 from adpi2/sbt2-check-cached-file 
[2.x] Report error if output file of a cached task is not in the output directory
 2024-04-29 16:09:33 +02:00
Adrien Piquerez 1f07c9cff7 Rolling back to macos-12 runner 2024-04-29 13:39:08 +02:00
Adrien Piquerez 2e439cab1e [2.x] report cache errors 
Report a cache error if the output file of a task is not cacheable
 2024-04-24 10:41:56 +02:00
eugene yokota 0c6d7b8f30
Merge pull request #7545 from mazugrin/1.10.x 
Update jansi dep to match the one that's included in the jline dep
 2024-04-18 18:36:21 -04:00
mazugrin 4d8bff40dc Update jansi dep to match the one that's included in the jline dep, which also allows sbt to work on ARM64 Windows without needing to specify -Djline.terminal=jline.UnsupportedTerminal 2024-04-18 12:54:31 -04:00
Tomasz Godzik 909de1de13
Merge pull request #500 from scala-steward/update/scala-xml-2.3.0 
Update scala-xml to 2.3.0
 2024-04-18 08:51:43 +02:00
Tomasz Godzik 6df7b74ffe
Merge branch 'main' into update/scala-xml-2.3.0 2024-04-17 17:25:51 +02:00
Tomasz Godzik 7dd79a4ff9
Merge pull request #499 from scala-steward/update/scala-collection-compat-2.12.0 
Update scala-collection-compat to 2.12.0
 2024-04-17 17:11:11 +02:00
Scala Steward 9af025d757
Update scala-xml to 2.3.0 2024-04-17 14:24:19 +00:00
Scala Steward 4e56e4626d
Update scala-collection-compat to 2.12.0 2024-04-17 14:24:17 +00:00
Adrien Piquerez 7c51ba2f64 Revert "Use fileConverter in cacheStore" 2024-04-17 09:30:44 +02:00
Adrien Piquerez 1765fde1ba Revert "Fix ActionCacheTest" 
This reverts commit 763383cadb.
 2024-04-17 09:01:29 +02:00
adpi2 771b1d3e84
Merge pull request #7538 from adpi2/sbt2-fix-force-update-period 
[2.x] Fix `dependency-management/force-update-period`
 2024-04-16 16:24:50 +02:00
Adrien Piquerez 1472ac287f [2.x] Fix dependency-management/force-update-period 2024-04-16 15:23:40 +02:00
eugene yokota facd7ab64e
Merge pull request #7525 from eed3si9n/wip/remoteapis 
[2.x] Remote caching support
 2024-04-15 18:28:46 -04:00
eugene yokota 6678746ef6
Merge pull request #7536 from sbt/eed3si9n-patch-1 
Fix typo
 2024-04-15 18:18:45 -04:00
Tomasz Godzik 3bc01dbe39
Merge pull request #498 from scala-steward/update/utest-0.8.3 
Update utest to 0.8.3
 2024-04-15 21:42:49 +02:00
eugene yokota 422d9e735f
Fix typo 2024-04-15 10:44:17 -04:00
Scala Steward 594d35e877
Update utest to 0.8.3 2024-04-15 14:31:30 +00:00
Adrien Piquerez 763383cadb Fix ActionCacheTest 2024-04-15 10:30:38 +02:00
eugene yokota acf825179b
Merge pull request #7534 from eed3si9n/wip/consistent 
Consistent Analysis
 2024-04-15 00:19:18 -04:00
Eugene Yokota b1a43f9adc Consistent Analysis 
See also https://github.com/sbt/zinc/pull/1326

This adds a new setting `enableConsistentCompileAnalysis`,
which enables the new "Consistent" Analysis format,
which is faster and more repeatable than the status quo.
This is initialized to `true` by default.
It can be opted out either by the setting or using
`-Dsbt.analysis2024=false`.
 2024-04-14 23:17:04 -04:00
eugene yokota e254370384
Merge pull request #7533 from eed3si9n/wip/sip51-error-message 
Improve the SIP-51 error message
 2024-04-14 21:38:23 -04:00
Eugene Yokota b19a54a1ef Improve the SIP-51 error message 2024-04-14 21:18:15 -04:00
eugene yokota 9bc0ba5f5b Update util-cache/src/main/scala/sbt/util/ActionCacheStore.scala 
Co-authored-by: adpi2 <adrien.piquerez@gmail.com>
 2024-04-14 14:58:13 -04:00
eugene yokota 0e67131beb
Update main/src/main/scala/sbt/Defaults.scala 
Co-authored-by: adpi2 <adrien.piquerez@gmail.com>
 2024-04-11 10:45:51 -04:00
Eugene Yokota 967d4a08b3 More robust against the lack of companion? 2024-04-11 13:55:29 +02:00
Eugene Yokota 33d50e2f47 Success log change fix 2024-04-11 13:55:29 +02:00
Eugene Yokota 86cf7c3a0c Remote caching support 
This implements Bazel-compat remote caching support via a plugin.
 2024-04-11 13:55:29 +02:00
adpi2 7064066e6f
Merge pull request #7531 from Philippus/patch-1 
Remove superfluous space
 2024-04-11 11:08:35 +02:00
Philippus Baalman f89505bb03
Remove superfluous space 2024-04-11 07:21:26 +02:00
adpi2 a5295ce80e
Merge pull request #7522 from adpi2/sbt2-fix-scripted 
[2.x] fix scripted
 2024-04-10 16:33:59 +02:00
Adrien Piquerez 8865565004 Fix classloader-cache/resources 2024-04-10 15:32:50 +02:00
Adrien Piquerez eda67a05fc Use fileConverter in cacheStore 
Otherwise the store cannot sync files that are not in the out folder.
 2024-04-09 16:09:44 +02:00
Adrien Piquerez 9e6612a3f8 Fix hashing of incrementalCompile 2024-04-09 15:33:22 +02:00
Adrien Piquerez 8870cb6a82 Fix Java 8 compat 2024-04-09 15:33:22 +02:00
Adrien Piquerez ab1aa6d001 Fix todos in actions/compile-clean 2024-04-09 15:33:22 +02:00
Adrien Piquerez e1cf43c6bd Add jar file to compileOutputs 2024-04-09 15:33:22 +02:00
eugene yokota 4c642e6d64
Merge pull request #7528 from eed3si9n/wip/zinc 
Zinc 1.10.0-RC1
 2024-04-08 23:45:17 -04:00
Eugene Yokota f804c28417 Zinc 1.10.0-RC1 2024-04-08 23:07:57 -04:00
eugene yokota 36d94c7993
Merge pull request #438 from eed3si9n/wip/util 
Util 1.10.0-RC1
 2024-04-08 22:51:20 -04:00
eugene yokota 671748362e
Merge pull request #437 from eed3si9n/wip/binary_sbt_version 
Use 2 for binarySbtVersion in 2.x
 2024-04-08 22:48:02 -04:00
Eugene Yokota 6ab6c2baa9 Util 1.10.0-RC1 2024-04-08 22:36:44 -04:00
Eugene Yokota 04fcad6d9a Use 2 for binarySbtVersion in 2.x 2024-04-08 22:33:56 -04:00
Adrien Piquerez 85fcb014f0 Fix data race to remote cache on classpath analyses 
The attributed classpath should point to the existing analysis file in the target folder to avoid data racing to the remote cache.
 2024-04-08 16:34:18 +02:00