Skip to content

Commit

Permalink
Remove mill-build from most BSP IT fixtures
Browse files Browse the repository at this point in the history 
These fixtures hard-code the Mill launcher class path, so they contain
its transitive dependencies and their versions. That means they would
needs to be updated every time a dependency of Mill is updated, which
would be quite cumbersome.

Note that they also contain issues: missing source JARs, dependencies
marked as unmanaged, …
  • Loading branch information
@alexarchambault
alexarchambault committed Sep 30, 2024
1 parent 648acfd commit 4fae5d5
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 1,188 deletions.
113 changes: 0 additions & 113 deletions integration/ide/bsp-server/resources/fixtures/build-targets-compile-classpaths.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,119 +8,6 @@
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.14/scala-library-2.13.14.jar",
"file:///workspace/hello-bsp/compile-resources"
]
},
{
"target": {
"uri": "file:///workspace/mill-build"
},
"classpath": [
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/mill-moduledefs_2.13/0.11.0-M2/mill-moduledefs_2.13-0.11.0-M2.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.13.14/scala-library-2.13.14.jar",
"file:///workspace/mill-build/compile-resources",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scalameta/scalafmt-dynamic_2.13/3.8.3/scalafmt-dynamic_2.13-3.8.3.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.13/2.3.0/scala-xml_2.13-2.3.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/github/alexarchambault/windows-ansi/windows-ansi/0.0.5/windows-ansi-0.0.5.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/get-coursier/interface/1.0.19/interface-1.0.19.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/mainargs_2.13/0.7.4/mainargs_2.13-0.7.4.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/requests_2.13/0.9.0/requests_2.13-0.9.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.5.7/logback-classic-1.5.7.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/net/java/dev/jna/jna-platform/5.14.0/jna-platform-5.14.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/eed3si9n/jarjarabrams/jarjar-abrams-core_2.13/1.14.0/jarjar-abrams-core_2.13-1.14.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/scalaparse_2.13/3.1.1/scalaparse_2.13-3.1.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/os-lib_2.13/0.10.7/os-lib_2.13-0.10.7.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/upickle_2.13/3.3.1/upickle_2.13-3.3.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.9.0/pprint_2.13-0.9.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.5.0/fansi_2.13-0.5.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-sbt/test-interface/1.0/test-interface-1.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/jline/jline/3.26.3/jline-3.26.3.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/get-coursier/coursier_2.13/2.1.13/coursier_2.13-2.1.13.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.13.14/scala-compiler-2.13.14.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.7/asm-tree-9.7.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.4.0/sourcecode_2.13-0.4.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scalameta/scalafmt-interfaces/3.8.3/scalafmt-interfaces-3.8.3.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scalameta/scalafmt-sysops_2.13/3.8.3/scalafmt-sysops_2.13-3.8.3.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/typesafe/config/1.4.3/config-1.4.3.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/2.0.15/slf4j-api-2.0.15.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-collection-compat_2.13/2.12.0/scala-collection-compat_2.13-2.12.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/geny_2.13/1.1.1/geny_2.13-1.1.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/ch/qos/logback/logback-core/1.5.7/logback-core-1.5.7.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/eed3si9n/jarjar/jarjar/1.14.0/jarjar-1.14.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.13.14/scala-reflect-2.13.14.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/fastparse_2.13/3.1.1/fastparse_2.13-3.1.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/ujson_2.13/3.3.1/ujson_2.13-3.3.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/upack_2.13/3.3.1/upack_2.13-3.3.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/upickle-implicits_2.13/3.3.1/upickle-implicits_2.13-3.3.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/kohlschutter/junixsocket/junixsocket-native-common/2.10.0/junixsocket-native-common-2.10.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/kohlschutter/junixsocket/junixsocket-common/2.10.0/junixsocket-common-2.10.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/github/plokhotnyuk/jsoniter-scala/jsoniter-scala-core_2.13/2.13.5.2/jsoniter-scala-core_2.13-2.13.5.2.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/get-coursier/coursier-core_2.13/2.1.13/coursier-core_2.13-2.1.13.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/get-coursier/coursier-cache_2.13/2.1.13/coursier-cache_2.13-2.1.13.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/get-coursier/coursier-proxy-setup/2.1.13/coursier-proxy-setup-2.1.13.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/github/java-diff-utils/java-diff-utils/4.12/java-diff-utils-4.12.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/ow2/asm/asm/9.7/asm-9.7.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-parallel-collections_2.13/1.0.4/scala-parallel-collections_2.13-1.0.4.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/upickle-core_2.13/3.3.1/upickle-core_2.13-3.3.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/github/alexarchambault/concurrent-reference-hash-map/1.1.0/concurrent-reference-hash-map-1.1.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/get-coursier/coursier-util_2.13/2.1.13/coursier-util_2.13-2.1.13.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/io/get-coursier/jniutils/windows-jni-utils/0.3.3/windows-jni-utils-0.3.3.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-archiver/4.9.0/plexus-archiver-4.9.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/2.1.1/plexus-container-default-2.1.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/virtuslab/scala-cli/config_2.13/0.2.1/config_2.13-0.2.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/4.0.0/plexus-utils-4.0.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-io/3.4.1/plexus-io-3.4.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/apache/commons/commons-compress/1.26.2/commons-compress-1.26.2.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/iq80/snappy/snappy/0.4/snappy-0.4.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/tukaani/xz/1.9/xz-1.9.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.5-10/zstd-jni-1.5.5-10.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/org/apache/xbean/xbean-reflect/3.7/xbean-reflect-3.7.jar",
"file:///coursier-cache/https/repo1.maven.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.jar",
"file:///mill-workspace/out/runner/compile.dest/classes",
"file:///mill-workspace/out/runner/client/compile.dest/classes",
"file:///mill-workspace/out/main/server/compile.dest/classes",
"file:///mill-workspace/out/main/codesig/compile.dest/classes",
"file:///mill-workspace/runner/linenumbers/resources",
"file:///mill-workspace/out/runner/linenumbers/compile.dest/classes",
"file:///mill-workspace/out/bsp/buildInfoResources.dest",
"file:///mill-workspace/out/bsp/compile.dest/classes",
"file:///mill-workspace/out/scalanativelib/worker-api/compile.dest/classes",
"file:///mill-workspace/out/scalanativelib/compile.dest/classes",
"file:///mill-workspace/out/scalajslib/worker-api/compile.dest/classes",
"file:///mill-workspace/out/scalajslib/buildInfoResources.dest",
"file:///mill-workspace/out/scalajslib/compile.dest/classes",
"file:///mill-workspace/out/kotlinlib/worker/compile.dest/classes",
"file:///mill-workspace/out/kotlinlib/buildInfoResources.dest",
"file:///mill-workspace/out/kotlinlib/compile.dest/classes",
"file:///mill-workspace/out/testrunner/entrypoint/compile.dest/classes",
"file:///mill-workspace/out/testrunner/compile.dest/classes",
"file:///mill-workspace/out/scalalib/api/buildInfoResources.dest",
"file:///mill-workspace/out/scalalib/api/compile.dest/classes",
"file:///mill-workspace/out/main/resolve/compile.dest/classes",
"file:///mill-workspace/out/main/util/compile.dest/classes",
"file:///mill-workspace/out/main/client/buildInfoResources.dest",
"file:///mill-workspace/out/main/client/compile.dest/classes",
"file:///mill-workspace/out/main/api/buildInfoResources.dest",
"file:///mill-workspace/out/main/api/compile.dest/classes",
"file:///mill-workspace/out/main/define/compile.dest/classes",
"file:///mill-workspace/out/main/eval/compile.dest/classes",
"file:///mill-workspace/out/main/buildInfoResources.dest",
"file:///mill-workspace/out/main/compile.dest/classes",
"file:///mill-workspace/scalalib/resources",
"file:///mill-workspace/out/scalalib/compile.dest/classes",
"file:///mill-workspace/out/idea/compile.dest/classes",
"file:///mill-workspace/out/main/init/exampleList.dest",
"file:///mill-workspace/out/main/init/compile.dest/classes",
"file:///mill-workspace/out/dist/runClasspath.dest",
"file:///coursier-cache/https/repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.3.0/sourcecode_2.13-0.3.0.jar",
"file:///mill-workspace/main/client/compile-resources",
"file:///mill-workspace/main/client/resources"
]
}
]
}
Loading

0 comments on commit 4fae5d5

Please sign in to comment.