Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.x] Merge all 1.x changes #7850

Draft
wants to merge 111 commits into
base: develop
Choose a base branch
from
Draft

[2.x] Merge all 1.x changes #7850

Changes from 2 commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
a7481e4
Include ALL sources, and resources in source jar
jroper Aug 26, 2024
ee7a9ae
Merge pull request #7630 from jroper/package-src
eed3si9n Aug 26, 2024
f6663a0
Fix stale BSP diagnostics
SlowBrainDude Jul 24, 2024
caf7e04
Merge pull request #7610 from SlowBrainDude/fix-stale-bsp-diagnostics
adpi2 Sep 2, 2024
03d5bf6
Fix BuildServerTest
adpi2 Sep 3, 2024
8ead896
Merge pull request #7638 from sbt/adpi2-patch-1
eed3si9n Sep 3, 2024
ee38417
update ErrorHandling.scala
xuwei-k Sep 10, 2024
4d7228a
Fix CI
adpi2 Sep 11, 2024
9eebe34
Merge pull request #7654 from adpi2/fix-ci
adpi2 Sep 11, 2024
f831f4d
Merge branch '1.10.x' into ThreadDeath-1
adpi2 Sep 11, 2024
e3b6286
Merge pull request #7652 from xuwei-k/ThreadDeath-1
adpi2 Sep 12, 2024
31dd85b
fix: Allow scripted to go through
eed3si9n Sep 15, 2024
2565b8c
Merge pull request #7672 from eed3si9n/wip/scripted_support
eed3si9n Sep 15, 2024
ddeb5db
feat: Use _sbt2_3 suffix
eed3si9n Sep 15, 2024
5e5d007
Bump the version number
eed3si9n Sep 15, 2024
dd1218b
fix: serverIdleTimeOut -> serverIdleTimeout
lervag Sep 10, 2024
843c2c2
Merge pull request #7673 from eed3si9n/bport/7651
eed3si9n Sep 15, 2024
2785db2
Zinc 1.10.2
eed3si9n Sep 15, 2024
c53a5a0
Merge pull request #7674 from eed3si9n/wip/bump-zinc
eed3si9n Sep 15, 2024
abb410b
Merge pull request #7671 from eed3si9n/wip/sbt-cross-publishing
eed3si9n Sep 15, 2024
4951e3e
sbt 1.10.2
eed3si9n Sep 16, 2024
b873c2e
Bump jline3 to 3.27.0
Friendseeker Sep 23, 2024
c3038dc
add dependabot setting for develop branch
xuwei-k Sep 28, 2024
3868f6a
Merge pull request #7701 from xuwei-k/dependabot-develop-branch
eed3si9n Sep 28, 2024
82bc9b4
Merge branch '1.10.x' into bump-jline3
Friendseeker Sep 30, 2024
a6daf2d
Remove vscode-sbt-scala from build.sbt
Friendseeker Oct 6, 2024
d453da8
Merge pull request #7728 from Friendseeker/remove-vscode-plugin
eed3si9n Oct 6, 2024
b36cf81
update to latest versions in TemplateCommandUtil
xuwei-k Oct 6, 2024
4d4d603
Merge pull request #7730 from xuwei-k/update-TemplateCommandUtil
eed3si9n Oct 6, 2024
48ac49d
Remove compile error in GCUtil
Friendseeker Oct 7, 2024
0b34b6b
Remove deprecated Thread.getId call
Friendseeker Oct 7, 2024
09c13af
Merge pull request #7732 from Friendseeker/remove-gc-workaround
eed3si9n Oct 7, 2024
c5b11a4
Merge pull request #7733 from Friendseeker/remove-deprecated-thread-id
eed3si9n Oct 7, 2024
1449d84
Fix Dependency Graph
Friendseeker Oct 9, 2024
8f657ce
Fix CI
Friendseeker Oct 9, 2024
26a7762
Merge pull request #7746 from Friendseeker/dependency-res-bump
eed3si9n Oct 9, 2024
f06b762
Scala 2.12.20 (was .19)
SethTisue Sep 2, 2024
bbbac6c
Merge pull request #7636 from SethTisue/1.10.x
eed3si9n Oct 10, 2024
00e5440
Merge branch '1.10.x' into bump-jline3
SethTisue Oct 11, 2024
72cd3e0
Merge pull request #7695 from Friendseeker/bump-jline3
eed3si9n Oct 11, 2024
eb35d21
Regenerate contraband files
Friendseeker Oct 15, 2024
a4398d0
chore: set a default timeout for ci
nathanlao Oct 15, 2024
03d001c
Merge pull request #7764 from Friendseeker/regenerate-contraband-files
adpi2 Oct 15, 2024
ad9878b
Merge branch '1.10.x' into timeout-for-ci-jobs
nathanlao Oct 15, 2024
bfb01d8
Merge pull request #7766 from nathanlao/timeout-for-ci-jobs
adpi2 Oct 15, 2024
a739760
Bump CI to JDK 21
Friendseeker Oct 12, 2024
6cea06d
Try workaround sbt.internal.inc.InvalidComponent
Friendseeker Oct 15, 2024
56f2a9a
Fix compiler-project/semantic-errors
Friendseeker Oct 15, 2024
c3d6bfe
Fix project/scala3-cross-target
Friendseeker Oct 15, 2024
a116a47
Fix dependency-management/stdlib-unfreeze
Friendseeker Oct 16, 2024
65a87ac
Merge pull request #7760 from Friendseeker/bump-ci-JDK-21
eed3si9n Oct 18, 2024
d9bc88a
Default to sbtn for sbt 2.x
eed3si9n Oct 18, 2024
d1a5862
Merge pull request #7775 from eed3si9n/wip/use_sbtn
eed3si9n Oct 18, 2024
a96ec6b
Bump IO, ipc-socket, and launcher
eed3si9n Oct 18, 2024
4b4b815
Merge pull request #7776 from eed3si9n/wip/bump_io
eed3si9n Oct 18, 2024
b7a6873
deps: Zinc 1.10.3
eed3si9n Oct 19, 2024
778cd09
Mark circular deps error as pending
eed3si9n Oct 19, 2024
628efcd
Merge pull request #7781 from eed3si9n/wip/bump_zinc
eed3si9n Oct 19, 2024
98f4571
deps: lm 1.10.2
eed3si9n Oct 19, 2024
80fb44c
Merge pull request #7782 from eed3si9n/wip/bump_lm
eed3si9n Oct 19, 2024
9a6931a
Add -march=compatibility
eed3si9n Oct 20, 2024
9483a3c
sbt 1.10.3
eed3si9n Oct 20, 2024
73f0575
Bump JDK version in Developer guide
Friendseeker Oct 20, 2024
fc6cede
ci: ubuntu-22.04 to workaround sbtn
eed3si9n Oct 20, 2024
5718c08
SBT -> sbt
Friendseeker Oct 20, 2024
812af3c
Merge pull request #7786 from eed3si9n/wip/actions
eed3si9n Oct 20, 2024
51de067
Merge pull request #7784 from Friendseeker/update-doc
eed3si9n Oct 20, 2024
784b56c
Remove potentially buggy unused methods
Friendseeker Oct 20, 2024
34fe56d
Merge pull request #7787 from Friendseeker/remove-unused
eed3si9n Oct 20, 2024
64fab3a
Bump Scala 2.13 to 2.13.15
Friendseeker Oct 21, 2024
f6d7f33
Bump sbt to 1.10.3
Friendseeker Oct 22, 2024
be0809c
Merge pull request #7802 from Friendseeker/bump-sbt
eed3si9n Oct 22, 2024
2851cc0
Merge pull request #7798 from Friendseeker/bump-scala-213-1
eed3si9n Oct 22, 2024
9d5cddd
Let Consistent Analysis to be opt-in by default
Friendseeker Oct 22, 2024
87792c2
Merge pull request #7807 from Friendseeker/consistent-analysis-opt-out
eed3si9n Oct 22, 2024
0e85726
Use JNI to replace deprecated Jansi & JNA
Friendseeker Oct 22, 2024
1ba63a1
Deprecate useJCenter key
Philippus Oct 23, 2024
d340ff9
Static Link musl for Linux Native Image build
Friendseeker Oct 23, 2024
5a215d0
Merge pull request #7822 from Philippus/deprecate-usejcenter-key
eed3si9n Oct 23, 2024
36fb500
Merge pull request #7811 from Friendseeker/use-jline-jni
eed3si9n Oct 23, 2024
0b01ed4
fix: Fixes BSP
eed3si9n Oct 24, 2024
60b451c
Address PR feedback & fix CI
Friendseeker Oct 24, 2024
20db3ed
Bump TEST_SBT_VER to 1.10.3
Friendseeker Oct 24, 2024
5658432
Delete .java-version
Friendseeker Oct 24, 2024
234781b
Merge pull request #7824 from eed3si9n/wip/bsp-fix
adpi2 Oct 24, 2024
1ca8ede
Rename to multirepo integration test
Friendseeker Oct 24, 2024
1e38f70
Merge pull request #7825 from Friendseeker/bump-test-sbt-ver
eed3si9n Oct 24, 2024
91ea2fe
Merge pull request #7827 from Friendseeker/delete-java-version
eed3si9n Oct 24, 2024
0c00dba
Merge pull request #7823 from Friendseeker/musl
eed3si9n Oct 24, 2024
da00a19
Bump JLine to 3.27.1
Friendseeker Oct 25, 2024
a46dfc0
Merge pull request #7829 from Friendseeker/bump-jline-3-27-1
eed3si9n Oct 25, 2024
5e7fe0b
Use more generic early output file name
Friendseeker Oct 25, 2024
824395f
Fix CI
Friendseeker Oct 25, 2024
4beb78b
Adopt PR feedbacks
Friendseeker Oct 25, 2024
7d674f6
Throw when template not found
Friendseeker Oct 27, 2024
2259598
Merge pull request #7835 from Friendseeker/sbt-7020
eed3si9n Oct 27, 2024
4e15180
Merge pull request #7830 from Friendseeker/remove-early-output-version
eed3si9n Oct 28, 2024
6d4d216
Set correct action for onTermination callback
Friendseeker Oct 28, 2024
64f0acf
Merge pull request #7838 from Friendseeker/sbt-7017
eed3si9n Oct 28, 2024
425e69f
deps: Zinc 1.10.4
eed3si9n Oct 28, 2024
4b04399
Merge pull request #7839 from eed3si9n/wip/bump_zinc
eed3si9n Oct 28, 2024
5096cc1
Adjust native image setting
eed3si9n Oct 28, 2024
634a584
sbt 1.10.4
eed3si9n Oct 28, 2024
28a9f9c
Prepare for sbt 1.10.5
Friendseeker Oct 28, 2024
5330deb
Merge pull request #7840 from Friendseeker/1-10-5-prep
eed3si9n Oct 28, 2024
828dc04
Migrate all usages of `System.console == null`
Friendseeker Oct 29, 2024
4835812
Merge pull request #7843 from Friendseeker/jdk-console-migrate
adpi2 Oct 29, 2024
92d4cfa
Replace nnbsp with regular space
Friendseeker Oct 30, 2024
fae2bcc
Add documentation & deduplicate implementation
Friendseeker Oct 30, 2024
94f239f
Merge pull request #7846 from Friendseeker/bye-bye-nnbsp
eed3si9n Oct 30, 2024
1ff2b12
Merge branch '1.10.x' into develop
Friendseeker Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
target-branch: "develop"
commit-message:
prefix: "[2.x] "
Loading