Commit b00807d
committed
Simplify ScipBuildTool now that it is a Bazel-only worker
ScipBuildTool is dispatched exclusively from IndexCommand.run() when the
Bazel aspect passes --scip-config, so a lot of its surface area was dead
code. Net: -501 lines.
ScipBuildTool:
- No longer extends BuildTool. It does not participate in detection, so
the name/isHidden/usedInCurrentDirectory overrides served no purpose.
generateScip() is renamed to run().
- Drop the Kotlin compilation path (~150 lines, K2JVMCompiler, message
collector, MPP common-source handling). The Bazel aspect only writes
*.java files to sourceFiles, so this code was unreachable.
- Drop Coursier-based dependency resolution. The aspect passes the full
classpath directly, never the 'dependencies' field.
- Drop Coursier-based JVM resolution (JvmIndex/JvmCache/JavaHome). The
aspect always sets 'javaHome'; the worker now requires it.
- Drop the JDK 'kind' branch and module-info partitioning. Bazel never
sets 'kind'.
- Drop the strictCompilation gate and the in-class ListBuffer that used
to combine Java + Kotlin compile attempts.
- Slim Config from 13 to 9 fields (drop dependencies, jvm, kind, plus
the Dependency case class and custom codec).
IndexCommand:
- Drop --strict-compilation (only consumed by the removed code path).
- Drop --scip-ignored-javac-option-prefixes and
--scip-ignored-annotation-processors. These were never propagated by
BazelBuildTool to the per-target invocations, so they were dead.
Dependencies.scala:
- Drop kotlinMPPCommon (sole caller was the removed Kotlin compile
path).
build.sbt:
- Drop the cli project's runtime dependency on kotlin-compiler-embeddable
and the four kotlin-scripting-* artifacts; nothing in the cli
references them anymore.
GradleJavaToolchains.scala:
- Drop the @language("Groovy") IDE hint; its provider class was only
available transitively via the kotlin-compiler-embeddable artifact we
just removed.1 parent cce9533 commit b00807d
5 files changed
Lines changed: 135 additions & 636 deletions
File tree
- scip-java/src/main/scala/com/sourcegraph/scip_java
- buildtools
- commands
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
235 | 235 | | |
236 | 236 | | |
237 | 237 | | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
| 238 | + | |
246 | 239 | | |
247 | 240 | | |
248 | 241 | | |
| |||
Lines changed: 0 additions & 35 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | | - | |
14 | 12 | | |
15 | 13 | | |
16 | 14 | | |
| |||
43 | 41 | | |
44 | 42 | | |
45 | 43 | | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | 44 | | |
80 | 45 | | |
81 | 46 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
| |||
86 | 85 | | |
87 | 86 | | |
88 | 87 | | |
89 | | - | |
90 | 88 | | |
91 | 89 | | |
92 | 90 | | |
| |||
0 commit comments