Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nix develop .#jdk21 # JDK 21
```

This drops you into a shell with `sbt`, `cs` (coursier), `maven`, `gradle`,
`bazelisk`, `scalafmt`, `nodejs`, `yarn`, `git`, `jq`, etc. all pinned to the
`bazelisk`, `scalafmt`, `nodejs`, `yarn`, `git`, etc. all pinned to the
versions used in CI.

If you'd rather install tools manually, you'll need at least:
Expand Down Expand Up @@ -55,7 +55,6 @@ These are the main components of the project.
| `buildTools/test` | sbt | Run slow build tool tests (Gradle, Maven). |
| `snapshots/testOnly tests.MinimizedSnapshotSuite` | sbt | Runs fast snapshot tests. Indexes a small set of files under `tests/minimized`. |
| `snapshots/testOnly tests.MinimizedSnapshotSuite -- *InnerClasses*` | sbt | Runs only individual tests cases matching the name "InnerClasses". |
| `snapshots/testOnly tests.LibrarySnapshotSuite` | sbt | Runs slow snapshot tests. Indexes a corpus of external Java libraries. |
| `snapshots/test` | sbt | Runs all snapshot tests. |
| `snapshots/run` | sbt | Update snapshot tests. Use this command after you have fixed a bug. |
| `cli/run --cwd DIRECTORY` | sbt | Run `scip-java` command-line tool against a given Gradle/Maven build. |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM eclipse-temurin:17@sha256:6eca72bb4cd5fb8cd215f2579a4dfffd24b0f47effb6c868b7e92b7f0422fa9f

RUN apt-get update && apt-get install --yes jq wget curl zip unzip git python3 python3-pip autoconf automake libtool build-essential libtool make g++
RUN apt-get update && apt-get install --yes wget curl zip unzip git python3 python3-pip autoconf automake libtool build-essential libtool make g++

WORKDIR /workdir

Expand Down
7 changes: 0 additions & 7 deletions bin/scip-java-docker-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@
# `scip-java` binary is already installed at `/app/scip-java/bin/scip-java`.
set -eu
JVM_VERSION="${JVM_VERSION:-21,17,11,8}"
FILE="$PWD/lsif-java.json"
if test -f "$FILE"; then
FROM_CONFIG=$(jq -r '.jvm' "$FILE")
if [ "$FROM_CONFIG" != "null" ]; then
JVM_VERSION="$FROM_CONFIG"
fi
fi

JVM_VERSIONS=$(echo "$JVM_VERSION" | tr "," "\n")

Expand Down
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
git
(gradle.override ({ java = jdk; }))
jdk
jq
(maven.override ({ jdk_headless = jdk; }))
nixfmt
nodejs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.sourcegraph.scip_java
import java.io.PrintStream

import com.sourcegraph.scip_java.commands.IndexCommand
import com.sourcegraph.scip_java.commands.IndexDependencyCommand
import com.sourcegraph.scip_java.commands.IndexSemanticdbCommand
import com.sourcegraph.scip_java.commands.SnapshotCommand
import moped.cli.Application
Expand All @@ -21,7 +20,6 @@ object ScipJava {
CommandParser[VersionCommand],
CommandParser[IndexCommand],
CommandParser[IndexSemanticdbCommand],
CommandParser[IndexDependencyCommand],
CommandParser[SnapshotCommand]
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,14 @@ case class IndexCommand(
"If true, automatically tries to extract the printed out sandbox command and re-run the command to reveal the underlying problem."
)
bazelAutorunSandboxCommand: Boolean = true,
@Hidden
@Description("Fail command invocation if compiler produces any errors")
strictCompilation: Boolean = false,
@Description(
"Optional. The build command to use to compile all sources. " +
"Defaults to a build-specific command. For example, the default command for Maven command is 'clean verify -DskipTests'." +
"To override the default, pass in the build command after a double dash: 'scip-java index -- compile test:compile'"
)

@Hidden
@Description("Fail command invocation if compiler produces any errors")
strictCompilation: Boolean = false,
@TrailingArguments()
buildCommand: List[String] = Nil,
@Hidden
Expand Down

This file was deleted.

Loading
Loading