Skip to content
Merged
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
12 changes: 6 additions & 6 deletions .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ examples/
maven-plugin/target/
project/target/
scip-java/target/
scip-semanticdb/target/
semanticdb-agent/target/
semanticdb-gradle-plugin/target/
semanticdb-java/target/
semanticdb-javac/target/
semanticdb-kotlinc/target/
scip-aggregator/target/
scip-agent/target/
scip-gradle-plugin/target/
scip-java/target/
scip-javac/target/
scip-kotlinc/target/
target/
tests/buildTools/target/
tests/minimized/target/
Expand Down
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ bazel-lsif-java

VERSION

semanticdb-gradle-plugin/gradle
scip-gradle-plugin/gradle
aspects/scip_java.bzl
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ jobs:

- uses: DeterminateSystems/magic-nix-cache-action@v13

- run: nix develop --command bazelisk build //... --//semanticdb-javac:enabled=true
- run: nix develop --command bazelisk run scip-semanticdb:bazel -- --sourceroot "$PWD"
- run: nix develop --command bazelisk build //... --//scip-javac:enabled=true
- run: nix develop --command bazelisk run scip-aggregator:bazel -- --sourceroot "$PWD"
- run: du -h index.scip
- run: nix develop "$GITHUB_WORKSPACE" --command bazelisk build //... --@scip_java//semanticdb-javac:enabled=true
- run: nix develop "$GITHUB_WORKSPACE" --command bazelisk build //... --@scip_java//scip-javac:enabled=true
working-directory: examples/bazel-example
- run: nix develop "$GITHUB_WORKSPACE" --command bazelisk run @scip_java//scip-semanticdb:bazel -- --sourceroot "$PWD"
- run: nix develop "$GITHUB_WORKSPACE" --command bazelisk run @scip_java//scip-aggregator:bazel -- --sourceroot "$PWD"
working-directory: examples/bazel-example
- run: du -h index.scip
working-directory: examples/bazel-example
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:

kotlin_plugin:
runs-on: ubuntu-latest
name: semanticdb-kotlinc
name: scip-kotlinc
steps:
- uses: actions/checkout@v4

Expand All @@ -118,16 +118,16 @@ jobs:

- uses: DeterminateSystems/magic-nix-cache-action@v13

- name: semanticdb-kotlinc tests
run: nix develop --command sbt semanticdbKotlinc/test
- name: scip-kotlinc tests
run: nix develop --command sbt scipKotlinc/test

- name: Kotlin snapshots
run: nix develop --command sbt semanticdbKotlincMinimized/kotlincSnapshots
run: nix develop --command sbt scipKotlincMinimized/kotlincSnapshots

- name: Check snapshot drift
run: |
git diff --exit-code \
semanticdb-kotlinc/minimized/src/generatedSnapshots
scip-kotlinc/minimized/src/generatedSnapshots

check:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -169,13 +169,13 @@ jobs:
mvn clean verify -DskipTests "-Dscip-java.version=$SCIP_JAVA_VERSION" sourcegraph:sourcegraphDependencies
working-directory: examples/maven-example

- run: nix develop "$GITHUB_WORKSPACE#jdk${{ matrix.java }}" --command "$SCIP_JAVA_CLI" index-semanticdb target/semanticdb-targetroot
- run: nix develop "$GITHUB_WORKSPACE#jdk${{ matrix.java }}" --command "$SCIP_JAVA_CLI" aggregate target/scip-targetroot
working-directory: examples/maven-example

- run: |
set -e
grep org.hamcrest target/semanticdb-targetroot/*dependencies.txt
grep "$PWD/src/main/java" target/semanticdb-targetroot/*dependencies.txt
grep org.hamcrest target/scip-targetroot/*dependencies.txt
grep "$PWD/src/main/java" target/scip-targetroot/*dependencies.txt
working-directory: examples/maven-example

- run: du -h index.scip
Expand Down
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ bazel-testlogs

VERSION

semanticdb-gradle-plugin/gradle
scip-gradle-plugin/gradle
/aspects/

tests/snapshots/META-INF/

# semanticdb-kotlinc kctfork-based tests run kotlinc with our plugin, which
# writes META-INF/semanticdb/sources/Test.kt.semanticdb relative to the test
# scip-kotlinc kctfork-based tests run kotlinc with our plugin, which
# writes META-INF/scip/sources/Test.kt.scip relative to the test
# cwd.
semanticdb-kotlinc/META-INF/
scip-kotlinc/META-INF/

# Standard sbt project metadata directories.
project/target/
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ If you'd rather install tools manually, you'll need at least:

These are the main components of the project.

- `semanticdb-javac/src/main/java`: the Java compiler plugin that creates
SemanticDB files.
- `scip-javac/src/main/java`: the Java compiler plugin that creates
SCIP files.
- `tests/minimized`: minimized Java source files that reproduce interesting test
cases.
- `tests/unit`: fast running unit tests that are helpful for local edit-and-test
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Java and Kotlin indexer for [SCIP](https://github.com/sourcegraph/scip) ![](https://img.shields.io/badge/status-development-green?style=flat)
# Java and Kotlin indexer for [SCIP](https://github.com/scip-code/scip) ![](https://img.shields.io/badge/status-development-green?style=flat)

| Documentation | Link |
| -------------------- | ---------------------------------------------------------------------- |
Expand Down
Loading
Loading