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.

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

Remove Ammonite as a dependency, handle script running and bootstrapping ourselves #2377

Merged
merged 208 commits into from
Apr 2, 2023
Merged
Changes from 1 commit
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
ebf0cc8
./mill -i -w dev.run example/example-1 foo.run passes, printing Hello…
lihaoyi Mar 21, 2023
eb243fd
remove the ammonite dependency, keep ammonite-util for now
lihaoyi Mar 21, 2023
658343a
break up MillMain
lihaoyi Mar 21, 2023
c86bd71
try to properly propagate watched paths
lihaoyi Mar 21, 2023
592073a
basic file watching works again
lihaoyi Mar 21, 2023
6005df4
minor cleanup
lihaoyi Mar 21, 2023
884fdae
remove final ammonite dependencies
lihaoyi Mar 21, 2023
69e2ebd
first file and ivy import work
lihaoyi Mar 21, 2023
58dc796
.
lihaoyi Mar 22, 2023
7e9f902
generate import trees
lihaoyi Mar 22, 2023
2a1b48f
get most tests compiling, except for entrypoint.test
lihaoyi Mar 22, 2023
47090d7
everything compiles
lihaoyi Mar 22, 2023
5551be7
fix ScriptTestSuite base path
lihaoyi Mar 22, 2023
a20bd9b
add moduledefs plugin to MillBootstrapModule to fix mill.integration…
lihaoyi Mar 22, 2023
40e502b
copy enclosing mill launcher to have proper file extension to make Zi…
lihaoyi Mar 22, 2023
5a9c3d9
vendor Ammonite's LineNumberPlugin, with some basic tests
lihaoyi Mar 22, 2023
672cb4b
consolidate integration tests under integration/ folder
lihaoyi Mar 22, 2023
5c16771
normalize MILL_BSP_WORKER mill module classpath handling in tests
lihaoyi Mar 22, 2023
1e95378
fix integration JavaCompileJarTests
lihaoyi Mar 22, 2023
c4011eb
Merge branch 'main' into remove-ammonite
lihaoyi Mar 22, 2023
eba011b
mill.integration.local.ForeignBuildsTest.checkProjectPaths and half o…
lihaoyi Mar 22, 2023
c3c346a
rest of mill.integration.local.ForeignBuildsTest now pass
lihaoyi Mar 22, 2023
d9bcb45
mill.integration.local.GenIdeaTests passes
lihaoyi Mar 22, 2023
f63ed25
remove old MILL_BUILD_LIBRARIES property
lihaoyi Mar 22, 2023
6f3c388
fix mill.eval.JavaCompileJarTests.javac
lihaoyi Mar 22, 2023
b020c83
commit moved iml files
lihaoyi Mar 22, 2023
8a66e46
first few ScriptsInvalidationTests pass
lihaoyi Mar 23, 2023
e2fc232
ScriptsInvalidationForeignTests and ScriptsInvalidationTests now pass
lihaoyi Mar 23, 2023
c31a85f
GenIdeaExtendedTests passes
lihaoyi Mar 23, 2023
7d204cb
fix
lihaoyi Mar 23, 2023
d6edcc0
avoid uniqueness error
lihaoyi Mar 23, 2023
2f96862
fix BspInstallDebugTest
lihaoyi Mar 23, 2023
d6b9835
update workflows
lihaoyi Mar 23, 2023
1612eac
Fix handling of scripts with shebang lines or leading comments
lihaoyi Mar 23, 2023
63cea8d
add entrypoint to testArgs to dev.assembly
lihaoyi Mar 23, 2023
bf0d376
try to fix URL -> Path conversion on Windows
lihaoyi Mar 23, 2023
ece13bc
fix java 8
lihaoyi Mar 23, 2023
69cb89d
add more debugging logs
lihaoyi Mar 23, 2023
66eb2a1
fix-quotes
lihaoyi Mar 23, 2023
61cade2
more debugging
lihaoyi Mar 23, 2023
b45fdca
more debugging
lihaoyi Mar 23, 2023
eeb088e
fixcompile
lihaoyi Mar 23, 2023
8ac8819
fixcompile
lihaoyi Mar 23, 2023
b9b02d5
moredebugging
lihaoyi Mar 23, 2023
805c7e0
more debugging
lihaoyi Mar 23, 2023
a1a94d1
debug
lihaoyi Mar 23, 2023
5ef72bf
debug
lihaoyi Mar 23, 2023
06b18a4
.
lihaoyi Mar 23, 2023
6541de0
.
lihaoyi Mar 23, 2023
d4fc01a
.
lihaoyi Mar 23, 2023
333aec8
cleanup
lihaoyi Mar 23, 2023
2201193
add back utest debugging
lihaoyi Mar 23, 2023
f9b0c59
more debugging
lihaoyi Mar 23, 2023
3887098
revert example changes
lihaoyi Mar 23, 2023
f64ddd0
.
lihaoyi Mar 23, 2023
29430fa
try different way of counting MILL_USER_CODE_START_MARKER that is rob…
lihaoyi Mar 23, 2023
770bcef
different way of copying mill-launcher.jar to try and avoid windows c…
lihaoyi Mar 23, 2023
3e8e471
use different mill-launcher jars for every mill version
lihaoyi Mar 23, 2023
0e3e5eb
add guard around copy-mill-launcher logic to try and avoid windows pe…
lihaoyi Mar 24, 2023
f5905a1
try to fix compile error positioning problems
lihaoyi Mar 24, 2023
6936c72
debug ParseErrorTests
lihaoyi Mar 24, 2023
83dc681
.
lihaoyi Mar 24, 2023
859e4fc
.
lihaoyi Mar 24, 2023
b08bb20
fixcompile
lihaoyi Mar 24, 2023
4fe5994
simplify ParseErrorTests
lihaoyi Mar 24, 2023
7e8eeb4
.
lihaoyi Mar 24, 2023
6968a66
tweaks
lihaoyi Mar 24, 2023
84ed12c
tweaks
lihaoyi Mar 24, 2023
7572c31
cleanup
lihaoyi Mar 25, 2023
a57fb9c
cleanup
lihaoyi Mar 25, 2023
705b4a3
try to re-organize MillBootstrap.scala
lihaoyi Mar 25, 2023
71c4285
bootstrap -> boot, consolidate watched logic
lihaoyi Mar 25, 2023
e1531b5
cleanup
lihaoyi Mar 25, 2023
9dcbdb2
kill AmmoniteUtils
lihaoyi Mar 25, 2023
bcc01a8
tweak file discovery and watching logic
lihaoyi Mar 25, 2023
a9ea03c
.
lihaoyi Mar 25, 2023
06c9f2d
fixbuild
lihaoyi Mar 25, 2023
62b38dc
add MILL_VERSION support
lihaoyi Mar 25, 2023
2833f0f
.
lihaoyi Mar 25, 2023
a113a1f
fix tests
lihaoyi Mar 25, 2023
3029b43
fix MillBuildModule.millSourcePath
lihaoyi Mar 25, 2023
4ac1e98
.
lihaoyi Mar 25, 2023
4b251af
properly manage evaluator state in the watchLoop
lihaoyi Mar 25, 2023
b2b64ca
simplify import graph handling
lihaoyi Mar 25, 2023
a5ebff1
remove unused EvaluatoreState#rootModule field, which can anyway be r…
lihaoyi Mar 25, 2023
b1f566d
remove systemProperties from EvaluatorState
lihaoyi Mar 25, 2023
c0d0f41
metabuild refactor compiles, doesn't pass any tests yet
lihaoyi Mar 25, 2023
404dbb7
basic meta-builds and meta-meta-builds now work
lihaoyi Mar 25, 2023
96c3d03
add first MetaMetaBuildTests
lihaoyi Mar 26, 2023
5405c55
metabuild refactor compiles, doesn't pass any tests yet
lihaoyi Mar 26, 2023
4b674d2
wip trying to adjust file paths
lihaoyi Mar 26, 2023
463de44
add MetaMetaBuildTests for compile and runtime errors
lihaoyi Mar 26, 2023
394ec47
remove [mill-build] prefix from errors
lihaoyi Mar 26, 2023
f776f13
custom top-level modules
lihaoyi Mar 26, 2023
ee99d4c
some invalidation tests pass
lihaoyi Mar 26, 2023
9b85004
integration.local tests pass
lihaoyi Mar 26, 2023
8ed5647
merge
lihaoyi Mar 26, 2023
eb6110e
remove ScriptTestSuite
lihaoyi Mar 26, 2023
42390f3
rename forked-server -> server
lihaoyi Mar 26, 2023
2c2226b
rename forked-server -> server
lihaoyi Mar 26, 2023
30b4a0d
simplify EvalResult
lihaoyi Mar 26, 2023
5270206
.
lihaoyi Mar 26, 2023
5782b00
fix github actions
lihaoyi Mar 26, 2023
94bd39f
rename MultiEvaluatorState -> RunnerState
lihaoyi Mar 26, 2023
088284d
fix ordering of previousEvalStates
lihaoyi Mar 27, 2023
ed6e243
fix integration tests
lihaoyi Mar 27, 2023
449668e
Fix mill.integration.server.MetaMetaBuildTests
lihaoyi Mar 27, 2023
4061e3f
simplify
lihaoyi Mar 27, 2023
ef3c6a5
simplify
lihaoyi Mar 27, 2023
4cc82f3
persist mill process in integration.server.test until end of each tes…
lihaoyi Mar 27, 2023
f657f7f
fix tests
lihaoyi Mar 27, 2023
1132540
add watched paths testing to the MultiLevelModuleTests
lihaoyi Mar 27, 2023
c6240d8
simplify MultiLevelBuildTests
lihaoyi Mar 27, 2023
e683d18
comment
lihaoyi Mar 27, 2023
dac3fff
cleanup
lihaoyi Mar 27, 2023
cf45f30
add TopLevelModuleTests
lihaoyi Mar 27, 2023
3a23867
remove dead TerminalGroup
lihaoyi Mar 27, 2023
f79b497
wip trying to fix and test bootstrap caching
lihaoyi Mar 28, 2023
ca518b9
basically works
lihaoyi Mar 28, 2023
11141e9
classloader invalidation mostly works again...
lihaoyi Mar 28, 2023
2a99bb1
re-introduce grand-parent-build classpath hash
lihaoyi Mar 28, 2023
914170c
comment
lihaoyi Mar 28, 2023
f88bad7
wip
lihaoyi Mar 28, 2023
a1caa6b
.
lihaoyi Mar 28, 2023
6ab2317
quick PathRefs for MillBuildModul#unmanagedClasspath
lihaoyi Mar 28, 2023
e093627
merge
lihaoyi Mar 28, 2023
3fb75aa
cleanup-build-sc
lihaoyi Mar 28, 2023
1e6306a
move script hashing out of evaluator fast path
lihaoyi Mar 28, 2023
2556cec
.
lihaoyi Mar 28, 2023
0bf0c17
.
lihaoyi Mar 28, 2023
49c0e26
add error message for missing build file and MissingBuildFileTests
lihaoyi Mar 28, 2023
98cd69f
try to fix MultiLevelBuildTests on windows
lihaoyi Mar 28, 2023
9182df5
merge
lihaoyi Mar 28, 2023
da1c914
wip
lihaoyi Mar 28, 2023
4bf3d73
fix genidea tests
lihaoyi Mar 29, 2023
04686f6
make debug flag work in forked integration tests
lihaoyi Mar 29, 2023
feeb191
all tests pass
lihaoyi Mar 29, 2023
3d41495
tests-pass
lihaoyi Mar 29, 2023
226694a
.
lihaoyi Mar 29, 2023
7155332
comment
lihaoyi Mar 29, 2023
ab912c0
cleanup
lihaoyi Mar 29, 2023
70e3bda
fix
lihaoyi Mar 29, 2023
51c6247
fix
lihaoyi Mar 29, 2023
4bde7a3
fix
lihaoyi Mar 29, 2023
9cb76f2
tweak paths
lihaoyi Mar 30, 2023
86d97d8
update patch file
lihaoyi Mar 30, 2023
4783286
update ci scripts
lihaoyi Mar 30, 2023
26b954b
update ci scripts
lihaoyi Mar 30, 2023
c05b727
fixes
lihaoyi Mar 30, 2023
9683392
add invalid-meta-module, multiple-top-level-modules test cases
lihaoyi Mar 30, 2023
ed7dfdf
split up integration tests into smaller jobs
lihaoyi Mar 30, 2023
64fee00
add tests to 5-scala-publish repo
lihaoyi Mar 30, 2023
b309547
wip re-organizing examples folder
lihaoyi Mar 30, 2023
c4be342
example-tests-pass
lihaoyi Mar 30, 2023
db2fcc4
.
lihaoyi Mar 30, 2023
386ad88
BuildModule
lihaoyi Mar 30, 2023
0a4a361
update CI
lihaoyi Mar 30, 2023
a62c6b7
fixes
lihaoyi Mar 30, 2023
e4426f5
example explanations
lihaoyi Mar 30, 2023
2fbfc53
split IntegrationTestModule and IntegrationTestCrossModule
lihaoyi Mar 30, 2023
b122666
.
lihaoyi Mar 30, 2023
7b3d4e3
fix-patch
lihaoyi Mar 30, 2023
b6cde25
.
lihaoyi Mar 30, 2023
41a6c95
more comments
lihaoyi Mar 30, 2023
85c96fe
get example tests passing
lihaoyi Mar 30, 2023
84300f7
add assembly to the examples
lihaoyi Mar 30, 2023
6c0048d
break up example into subfolders
lihaoyi Mar 30, 2023
95737c5
add version-specific test sources
lihaoyi Mar 30, 2023
809c7c0
.
lihaoyi Mar 31, 2023
c8f4e80
update patch file
lihaoyi Mar 31, 2023
0074d25
add common-overrides and custom-tasks examples
lihaoyi Mar 31, 2023
91b3638
more web examples
lihaoyi Mar 31, 2023
1d190fc
5-webapp-scalajs-shared
lihaoyi Mar 31, 2023
7839169
fix fork
lihaoyi Mar 31, 2023
1a43868
.
lihaoyi Mar 31, 2023
b09ece3
fixes
lihaoyi Mar 31, 2023
fc31c48
fixes
lihaoyi Mar 31, 2023
2e05d5b
finally cleanup
lihaoyi Mar 31, 2023
122ffc3
try to get CI green
lihaoyi Mar 31, 2023
58e4dd5
reduce build matrix
lihaoyi Mar 31, 2023
b57ae36
reduce build matrix more
lihaoyi Mar 31, 2023
038e3f0
.
lihaoyi Mar 31, 2023
319d163
more stripping build matrix
lihaoyi Apr 1, 2023
077b8b9
tidying
lihaoyi Apr 1, 2023
7e1437a
add 3-import-file-ivy example
lihaoyi Apr 1, 2023
01f5ac9
fixes
lihaoyi Apr 1, 2023
34693da
make use of generatedSources in 4-mill-build-folder
lihaoyi Apr 1, 2023
ae05f1e
fix
lihaoyi Apr 1, 2023
7124998
example readme
lihaoyi Apr 1, 2023
ea7314e
tweak-comment
lihaoyi Apr 1, 2023
24e401b
.
lihaoyi Apr 1, 2023
e91b41e
better error
lihaoyi Apr 1, 2023
3210acc
fix
lihaoyi Apr 1, 2023
e6308fc
.
lihaoyi Apr 1, 2023
c49dbaa
standardize naming on RootModule
lihaoyi Apr 1, 2023
4ad7200
.
lihaoyi Apr 1, 2023
d9f3ebd
fix
lihaoyi Apr 1, 2023
0ad2efb
try-fix
lihaoyi Apr 1, 2023
1bc24f4
remove windows assembly from examples
lihaoyi Apr 1, 2023
41921ef
try to fudge windows paths
lihaoyi Apr 1, 2023
17f4907
.
lihaoyi Apr 1, 2023
101718f
debug
lihaoyi Apr 1, 2023
f24b4ac
debug
lihaoyi Apr 1, 2023
d070d7e
.
lihaoyi Apr 1, 2023
63affbf
.
lihaoyi Apr 1, 2023
97f896a
.
lihaoyi Apr 1, 2023
a3976ee
.
lihaoyi Apr 1, 2023
76abe80
.
lihaoyi Apr 1, 2023
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
Prev Previous commit
Next Next commit
.
  • Loading branch information
lihaoyi committed Mar 30, 2023
commit b122666404263a1d5a84995bbaefb0f6e347e08b
3 changes: 0 additions & 3 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -1039,11 +1039,8 @@ trait IntegrationTestModule extends MillScalaModule {
def repoSlug: String

def scalaVersion = integration.scalaVersion()

def moduleDeps = Seq(main.test, integration)

def sources = T.sources(millSourcePath / "test" / "src")

def testRepoRoot: T[PathRef] = T.source(millSourcePath / "repo")

trait ModeModule extends MillScalaModule with BaseMillTestsModule {
Expand Down