Commit Graph

16615 Commits

Author SHA1 Message Date
Friendseeker 375e4f1d2e Fix bunch of unused imports 2024-10-21 21:38:59 -07:00
Friendseeker f87ffc8042 Fix CI compile errors 2024-10-21 21:38:59 -07:00
Friendseeker ed23024c75 Try fix inode pattern match error 2024-10-21 21:38:59 -07:00
Friendseeker d74e0534a4 Bump Scala 3 to 3.3.4 2024-10-21 21:38:59 -07:00
eugene yokota b8bef9d0b9
Merge pull request #7803 from Friendseeker/template-port-2
[2.x] update to latest versions in TemplateCommandUtil
2024-10-21 21:42:29 -04:00
eugene yokota ccb5e11be9
Merge pull request #7800 from Friendseeker/bump-sbt-sbt-io
[2.x] Bump sbt to 1.10.3 and sbt-io to 1.10.1
2024-10-21 21:42:03 -04:00
eugene yokota 32464d382c
Merge pull request #7797 from Friendseeker/bump-scala-2
[2.x] Bump Scala 2.12 to 2.12.20
2024-10-21 21:41:28 -04:00
eugene yokota c39d74d062
Merge pull request #7801 from xuwei-k/delete-useJCenter
[2.x] delete `useJCenter` settingKey
2024-10-21 21:36:15 -04:00
eugene yokota 03f3875c0f
Merge pull request #7799 from xuwei-k/update-sbtResolvers
[2.x] update `sbtResolvers` default value
2024-10-21 21:35:33 -04:00
kenji yoshida fe523c50bc update to latest versions in TemplateCommandUtil 2024-10-21 17:10:33 -07:00
xuwei-k 026f78d056 delete useJCenter settingKey 2024-10-22 09:00:05 +09:00
Eugene Yokota de23adb2b2 ci: ubuntu-22.04 to workaround sbtn 2024-10-21 16:42:07 -07:00
Friendseeker 95d5aa7c4c Bump sbt & sbt-io version 2024-10-21 16:38:30 -07:00
Friendseeker 0b77171f31 Bump to Scala 2.12.20 in test files 2024-10-21 16:06:51 -07:00
xuwei-k a99398eb84 update sbtResolvers default value 2024-10-22 07:25:22 +09:00
Friendseeker dd16c9b0db Bump Scala 2 to 2.19.20 2024-10-21 15:11:52 -07:00
eugene yokota acf8ec77c3
Merge pull request #7795 from Friendseeker/bsp-forward-port
[2.x] Fix stale bsp diagnostics
2024-10-21 18:04:29 -04:00
SlowBrainDude b1b5caa1ca 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-10-21 12:18:41 -07:00
eugene yokota 3decafbf43
Merge pull request #7788 from Friendseeker/package-src 2024-10-20 09:15:32 -04:00
James Roper 4b75c97f69 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-10-19 23:09:51 -07:00
eugene yokota 16f93c543a
Merge pull request #7783 from Friendseeker/bump-ci-JDK-21-2
[2.x] Bump CI to JDK 21
2024-10-20 01:19:40 -04:00
friendseeker ee59af3d33
SBT -> sbt 2024-10-19 21:52:20 -07:00
friendseeker a12951a9e5
Bump JDK version in Developer guide 2024-10-19 21:29:01 -07:00
friendseeker e0d9493a93
Bump CI to JDK 21 2024-10-19 21:08:20 -07:00
eugene yokota 4f65bb5739
Merge pull request #7780 from xuwei-k/codecPackage-state
[2.x] add `@codecPackage` annotation to `state.contra`
2024-10-19 00:20:46 -04:00
xuwei-k 6406124aeb add `codecPackage` annotation to `state.contra` 2024-10-19 07:31:07 +09:00
eugene yokota e3d06d5e65
Merge pull request #7778 from xuwei-k/contraband-generate-check
[2.x] Update contraband sources. add check contraband sources consistency job
2024-10-18 09:53:16 -04:00
xuwei-k 24e059c60c check contraband sources consistency 2024-10-18 20:34:44 +09:00
xuwei-k 6bf5b8b30f Update contraband sources 2024-10-18 20:34:44 +09:00
eugene yokota d105da0bde
Merge pull request #7773 from xuwei-k/issue-7768
[2.x] fix type error if too many `.value`
2024-10-17 16:52:56 -04:00
xuwei-k b3336b2ce2 fix type error if too many `.value` 2024-10-17 10:35:16 +09:00
eugene yokota 3c20f321d2
Merge pull request #7769 from nathanlao/develop-timeout
chore: update develop branch to set default CI timeout
2024-10-16 00:47:41 -04:00
nathanlao fbab641742 chore: setup a default timeout for ci 2024-10-15 19:57:07 -07:00
adpi2 fd52e28492
Merge pull request #7765 from xuwei-k/sbtVersion-in-pluginCrossBuild
fix old `in` syntax
2024-10-15 09:27:04 +02:00
xuwei-k 6372c2056a fix old `in` syntax 2024-10-15 14:54:52 +09:00
adpi2 b3a7eab060
Merge pull request #7763 from adpi2/2.x-speed-up-ci
[2.x] Skip publishing local Zinc to speed up CI
2024-10-14 21:12:57 +02:00
eugene yokota 03fd43fdc1
Merge pull request #7762 from adpi2/2.x-fix-7721
[2.x] Fix `csrCacheDirectory` and add test
2024-10-14 12:39:14 -04:00
Adrien Piquerez c82f13c2db Fix csrCacheDirectory and add test 2024-10-14 15:35:14 +02:00
Adrien Piquerez 5bd0f0e3da Speed up CI 2024-10-14 15:14:10 +02:00
adpi2 9517813190
Merge pull request #7759 from Friendseeker/develop
[2.x] Remove Scala 2 cross build for `util`
2024-10-14 10:31:27 +02:00
friendseeker 633a8c9860
Adopt PR feedback 2024-10-14 01:01:33 -07:00
Friendseeker e35d14aa46 Drop scala212, scala213 for utils 2024-10-11 17:45:59 -07:00
eugene yokota 00c0d58fe4
Merge pull request #7756 from Friendseeker/bump-jline3-2
[2.x] Bump jline3 to `3.27.0`
2024-10-11 18:03:57 -04:00
eugene yokota 4210dbe61c
Merge pull request #7757 from adpi2/2.x-fix-flaky-ci
[2.x] Try fix flaky CI
2024-10-11 18:03:11 -04:00
Friendseeker 78a4cdff0b Bump CI OS 2024-10-11 13:44:33 -07:00
Friendseeker f213eb0175 Bump jline3 to 3.27.0 2024-10-11 13:44:33 -07:00
Adrien Piquerez 4f20428593 Try fix flaky CI 2024-10-11 19:45:07 +02:00
adpi2 49e1d8acd8
Merge pull request #7752 from adpi2/2.x-merge-librarymanagement
[2.x] upgrade and reenable sbt'contraband plugin
2024-10-11 19:43:14 +02:00
adpi2 242bd18d30
Merge pull request #7755 from adpi2/2.x-lm-coursier-shading
[2.x] Exclude Scala libraries from lm-coursier-shaded
2024-10-11 19:43:00 +02:00
Adrien Piquerez 9d94423f24 [2.x] Exclude Scala libraries from lm-coursier-shaded 2024-10-11 17:42:34 +02:00