Drop ScipBuildTool and related code#885
Closed
jupblb wants to merge 3 commits into
Closed
Conversation
Removes the SCIP-specific build tool that consumed scip-java.json / lsif-java.json config files, along with everything that only existed to support it: - ScipBuildTool and its test suite - IndexDependencyCommand (only invoked the dropped 'scip' build tool) - LibrarySnapshotGenerator + SemanticdbJavacSnapshotGenerator and the org.jetbrains.exposed snapshot fixtures (the generator only worked via index-dependency) - TracingServer test helper (only used by ScipBuildToolSuite) - Dependencies.kotlinMPPCommon (only used by ScipBuildTool) - The scipConfig / scipIgnoredJavacOptionPrefixes / scipIgnoredAnnotationProcessors CLI flags - The lsif-java.json JVM lookup in scip-java-docker-script.sh, and the now-unused jq install (Dockerfile, flake.nix, CONTRIBUTING.md) Also fixes a pre-existing misplaced @description annotation in IndexCommand so that the buildCommand description is actually attached to buildCommand instead of leaking onto strictCompilation.
With only MinimizedSnapshotScipGenerator remaining, the abstraction layers became unnecessary: - Inline AggregateSnapshotGenerator into SaveSnapshots and delete it - Inline the abstract SnapshotSuite into its only subclass - Drop SnapshotHandler.withoutFinishedEvent (only used by the dropped aggregator) - Drop a dead onFinished override in MinimizedSnapshotScipGenerator
The Bazel aspect at scip-java/src/main/resources/scip-java/scip_java.bzl delegates per-target Java compilation to scip-java via 'scip-java index --scip-config=<file>', which was handled by ScipBuildTool. Without it, the bazel_aspect CI job fails with 'found argument --scip-config which wasn't expected'. This restores ScipBuildTool, BuildTool registration, Dependencies helpers, and the related test infrastructure exactly as they were before the previous two commits. The rest of the cleanup (IndexDependencyCommand removal, library snapshot fixtures, snapshot infrastructure simplification, jq removal, IndexCommand @description fix) is preserved.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Removes the SCIP-specific build tool that consumed
scip-java.json/lsif-java.jsonconfig files, along with everything that only existed to support it.