Commit Graph

16595 Commits

Author SHA1 Message Date
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
Adrien Piquerez 2cef7222f1 Move dataclassGen to Utils 2024-10-11 17:00:19 +02:00
Adrien Piquerez 9c73630b3a Re-generate contraband after update 2024-10-11 16:30:51 +02:00
Adrien Piquerez 644f139da3 Merge remote-tracking branch 'lm/wip/sbt-2.x' into 2.x-merge-librarymanagement 2024-10-11 16:22:55 +02:00
adpi2 6d6cbce465
Merge pull request #7739 from adpi2/2.x-lm-coursier
[2.x] Merge librarymanagement and sbt-coursier
2024-10-11 16:14:17 +02:00
Adrien Piquerez 6c1217847e Add NOTICE and headerLicense 2024-10-11 14:32:32 +02:00
Adrien Piquerez a90bdcf703 Fix dependency-management/cache-update 2024-10-11 14:32:32 +02:00
Adrien Piquerez 2fc78b4033 Fix ConfigMacroTest 2024-10-11 14:32:32 +02:00
Adrien Piquerez d0003bbb0f Fix Eval on Windows 2024-10-11 14:32:32 +02:00
Adrien Piquerez 713a495f92 Move lm-coursier CI to job-type 2024-10-11 14:32:32 +02:00
Adrien Piquerez a07bf4eea8 Fix lm-coursier shading 2024-10-11 14:32:32 +02:00
Adrien Piquerez 149aa09315 Fix lm-coursier scripted 2024-10-11 14:30:55 +02:00
Adrien Piquerez 6d3fcb495d Move lm-coursier scripted to sbt-app 2024-10-11 14:30:55 +02:00
Adrien Piquerez 379cfa8ca0 Remove lmCoursierCustomProtocol projects 2024-10-11 14:30:55 +02:00
eugene yokota 733bcfb239
Merge pull request #7750 from Friendseeker/dependency-res-bump-2
[2.x] Submit dependency graph for security alert
2024-10-10 11:59:11 -04:00
eugene yokota be60306482
Merge pull request #7749 from eed3si9n/wip/task-fix
[2.x] fix: Resurrect `or` for tasks
2024-10-10 11:55:43 -04:00
friendseeker 4769a02ec0 Forward Port #7746 2024-10-10 00:21:51 -07:00
Eugene Yokota 65bc3d9722 fix: Resurrect or for tasks
**Problem**
1. `or` is missing
2. `?` should have English method name

**Solution**
1. This resurrects `or`
2. Name `??` as `option`, since `get` is taken
2024-10-10 02:39:52 -04:00
adpi2 ee7f782ed8
Merge pull request #454 from jtjeferreira/contraband
[2.x] upgrade and reenable sbt'contraband plugin
2024-10-09 14:43:36 +02:00
Adrien Piquerez eaf604f14d Clean lm-coursier scripted 2024-10-09 14:39:42 +02:00
Adrien Piquerez ef17173fcf Fix nightly workflow 2024-10-09 13:43:02 +02:00