diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cd1c76d05..1c83f6a5a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v4 - name: Build Dockerised CLI - run: docker build -t sourcegraph/scip-java:latest . + run: docker build -t ghcr.io/scip-code/scip-java:latest . - name: Test repos shell: bash @@ -58,7 +58,7 @@ jobs: mkdir -p ".repos/$REPO" git clone "https://github.com/$REPO.git" ".repos/$REPO" && cd ".repos/$REPO" && git submodule update --init - docker run -v "$PWD/.repos/$REPO:/sources" -w /sources sourcegraph/scip-java:latest scip-java index + docker run -v "$PWD/.repos/$REPO:/sources" -w /sources ghcr.io/scip-code/scip-java:latest scip-java index file ".repos/$REPO/index.scip" || (echo "$REPO SCIP index doesn't exist!"; exit 1) } diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml index 2f2d2072b..076c865de 100644 --- a/.github/workflows/nix.yaml +++ b/.github/workflows/nix.yaml @@ -154,7 +154,7 @@ jobs: printf 'SCIP_JAVA_VERSION=%s\n' "$SCIP_JAVA_VERSION" >> "$GITHUB_ENV" printf 'SCIP_JAVA_CLI=%s\n' "$PWD/scip-java/build/install/scip-java/bin/scip-java" >> "$GITHUB_ENV" - - run: mvn clean verify -DskipTests "-Dscip-java.version=$SCIP_JAVA_VERSION" sourcegraph:sourcegraphDependencies + - run: mvn clean verify -DskipTests "-Dscip-java.version=$SCIP_JAVA_VERSION" scip:dependencies working-directory: examples/maven-example - run: | diff --git a/.github/workflows/release-cli.yaml b/.github/workflows/release-cli.yaml index c33e896a6..adb203cd7 100644 --- a/.github/workflows/release-cli.yaml +++ b/.github/workflows/release-cli.yaml @@ -37,7 +37,7 @@ jobs: cd "$OUT_DIR" VERSION=${VERSION#v} - ARTIFACT="com.sourcegraph:scip-java:${VERSION}" + ARTIFACT="org.scip-code:scip-java:${VERSION}" for attempt in {1..10}; do if cs resolve "$ARTIFACT" >/dev/null 2>&1; then @@ -57,7 +57,7 @@ jobs: --bat=true \ -o scip-java \ "$ARTIFACT" \ - --main com.sourcegraph.scip_java.ScipJava + --main org.scip_code.scip_java.ScipJava chmod +x scip-java ./scip-java --help >/dev/null @@ -74,11 +74,11 @@ jobs: run: | set -euo pipefail - if gh release view "$TAG" --repo "sourcegraph/scip-java" >/dev/null 2>&1; then + if gh release view "$TAG" --repo "scip-code/scip-java" >/dev/null 2>&1; then echo "exists=true" >> "$GITHUB_OUTPUT" else echo "exists=false" >> "$GITHUB_OUTPUT" - echo "GitHub release $TAG does not exist in sourcegraph/scip-java; skipping asset upload." + echo "GitHub release $TAG does not exist in scip-code/scip-java; skipping asset upload." fi - name: Upload release assets @@ -96,5 +96,5 @@ jobs: "scip-java-${TAG}" \ "scip-java-${TAG}.bat" \ "scip-java-${TAG}.sha256" \ - --repo "sourcegraph/scip-java" \ + --repo "scip-code/scip-java" \ --clobber diff --git a/.github/workflows/release-docker.yaml b/.github/workflows/release-docker.yaml index eb37ca8f9..947ef85df 100644 --- a/.github/workflows/release-docker.yaml +++ b/.github/workflows/release-docker.yaml @@ -4,32 +4,91 @@ on: branches: - main tags: ["*"] + +permissions: + contents: read + packages: write + jobs: publish: - runs-on: ubuntu-latest + strategy: + matrix: + include: + - runner: ubuntu-latest + arch: amd64 + - runner: ubuntu-24.04-arm + arch: arm64 + runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 with: fetch-depth: 0 + - uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub + + - name: Login to GitHub Container Registry uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Build and push Docker image + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Resolve Docker tag + id: tag shell: bash run: | set -euo pipefail - tags=(--tag sourcegraph/scip-java:latest-snapshot) - + image="ghcr.io/scip-code/scip-java" if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then version="${GITHUB_REF_NAME#v}" - tags=( - --tag sourcegraph/scip-java:latest - --tag "sourcegraph/scip-java:${version}" - ) + tag="${image}:${version}-${{ matrix.arch }}" + else + tag="${image}:latest-snapshot-${{ matrix.arch }}" fi - docker buildx build --push "${tags[@]}" . + echo "tag=${tag}" >> "$GITHUB_OUTPUT" + + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: . + push: true + platforms: linux/${{ matrix.arch }} + tags: ${{ steps.tag.outputs.tag }} + labels: | + org.opencontainers.image.source=https://github.com/scip-code/scip-java + org.opencontainers.image.revision=${{ github.sha }} + + publish-manifest: + needs: publish + runs-on: ubuntu-latest + steps: + - uses: docker/setup-buildx-action@v3 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Create and push multi-arch manifest + shell: bash + run: | + set -euo pipefail + + image="ghcr.io/scip-code/scip-java" + if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then + version="${GITHUB_REF_NAME#v}" + docker buildx imagetools create \ + --tag "${image}:latest" \ + --tag "${image}:${version}" \ + "${image}:${version}-amd64" \ + "${image}:${version}-arm64" + else + docker buildx imagetools create \ + --tag "${image}:latest-snapshot" \ + "${image}:latest-snapshot-amd64" \ + "${image}:latest-snapshot-arm64" + fi diff --git a/.github/workflows/release-maven.yaml b/.github/workflows/release-maven.yaml index b3763d599..41555b45b 100644 --- a/.github/workflows/release-maven.yaml +++ b/.github/workflows/release-maven.yaml @@ -19,8 +19,8 @@ jobs: if: ${{ !startsWith(github.ref, 'refs/tags/') }} run: nix develop --command gradle --no-daemon publishToMavenCentral env: - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }} - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }} - name: Publish release ${{ github.ref }} if: ${{ startsWith(github.ref, 'refs/tags/') }} run: | @@ -28,10 +28,9 @@ jobs: nix develop --command gradle --no-daemon \ "-PreleaseVersion=$version" publishAndReleaseToMavenCentral env: - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }} - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }} - ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.PGP_SECRET }} - ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.PGP_PASSPHRASE }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} release-cli: if: ${{ startsWith(github.ref, 'refs/tags/') }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32250378a..85c7f09c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,12 @@ # Contributing guide This page documents tips and tricks for contributing to the -[sourcegraph/scip-java](https://github.com/sourcegraph/scip-java) codebase. +[scip-code/scip-java](https://github.com/scip-code/scip-java) codebase. ## System dependencies The recommended way to get a working development environment is via -[Nix](https://nixos.org/download) and the provided [flake](https://github.com/sourcegraph/scip-java/blob/main/flake.nix): +[Nix](https://nixos.org/download) and the provided [flake](flake.nix): ```sh nix develop # default shell (JDK 17) diff --git a/README.md b/README.md index c1ce4f0de..14002707b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # Java and Kotlin indexer for [SCIP](https://github.com/scip-code/scip) ![](https://img.shields.io/badge/status-development-green?style=flat) -| Documentation | Link | -| -------------------- | ---------------------------------------------------------------------- | -| Landing page | https://sourcegraph.github.io/scip-java | -| Getting started | https://sourcegraph.github.io/scip-java/docs/getting-started.html | -| Manual configuration | https://sourcegraph.github.io/scip-java/docs/manual-configuration.html | -| Contributing | https://sourcegraph.github.io/scip-java/docs/contributing.html | -| Design | https://sourcegraph.github.io/scip-java/docs/design.html | +| Documentation | Link | +| -------------------- | ------------------------------------------------------ | +| Getting started | [docs/getting-started.md](docs/getting-started.md) | +| Manual configuration | [docs/manual-configuration.md](docs/manual-configuration.md) | +| Contributing | [CONTRIBUTING.md](CONTRIBUTING.md) | +| Design | [docs/design.md](docs/design.md) | diff --git a/build-logic/src/main/kotlin/com/sourcegraph/buildlogic/GeneratedFiles.kt b/build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/GeneratedFiles.kt similarity index 94% rename from build-logic/src/main/kotlin/com/sourcegraph/buildlogic/GeneratedFiles.kt rename to build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/GeneratedFiles.kt index 1e096fee9..fa04f8a69 100644 --- a/build-logic/src/main/kotlin/com/sourcegraph/buildlogic/GeneratedFiles.kt +++ b/build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/GeneratedFiles.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.buildlogic +package org.scip_code.scip_java.buildlogic import org.gradle.api.Project import org.gradle.api.Task diff --git a/build-logic/src/main/kotlin/com/sourcegraph/buildlogic/JavacInternals.kt b/build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/JavacInternals.kt similarity index 94% rename from build-logic/src/main/kotlin/com/sourcegraph/buildlogic/JavacInternals.kt rename to build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/JavacInternals.kt index f873e6f25..3d8d6d459 100644 --- a/build-logic/src/main/kotlin/com/sourcegraph/buildlogic/JavacInternals.kt +++ b/build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/JavacInternals.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.buildlogic +package org.scip_code.scip_java.buildlogic import java.io.File import java.util.Properties diff --git a/build-logic/src/main/kotlin/com/sourcegraph/buildlogic/ScipCompile.kt b/build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/ScipCompile.kt similarity index 98% rename from build-logic/src/main/kotlin/com/sourcegraph/buildlogic/ScipCompile.kt rename to build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/ScipCompile.kt index 684faa25a..079e9b877 100644 --- a/build-logic/src/main/kotlin/com/sourcegraph/buildlogic/ScipCompile.kt +++ b/build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/ScipCompile.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.buildlogic +package org.scip_code.scip_java.buildlogic import java.io.File import org.gradle.api.Task diff --git a/build-logic/src/main/kotlin/com/sourcegraph/buildlogic/SharedArtifacts.kt b/build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/SharedArtifacts.kt similarity index 97% rename from build-logic/src/main/kotlin/com/sourcegraph/buildlogic/SharedArtifacts.kt rename to build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/SharedArtifacts.kt index cf374c297..345e2223f 100644 --- a/build-logic/src/main/kotlin/com/sourcegraph/buildlogic/SharedArtifacts.kt +++ b/build-logic/src/main/kotlin/org/scip_code/scip_java/buildlogic/SharedArtifacts.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.buildlogic +package org.scip_code.scip_java.buildlogic import org.gradle.api.Project import org.gradle.api.artifacts.Configuration diff --git a/build-logic/src/main/kotlin/scip.maven-publish.gradle.kts b/build-logic/src/main/kotlin/scip.maven-publish.gradle.kts index a2a138ffc..a659f67d6 100644 --- a/build-logic/src/main/kotlin/scip.maven-publish.gradle.kts +++ b/build-logic/src/main/kotlin/scip.maven-publish.gradle.kts @@ -5,7 +5,7 @@ plugins { } extensions.configure("mavenPublishing") { - val repositoryUrl = "https://github.com/sourcegraph/scip-java" + val repositoryUrl = "https://github.com/scip-code/scip-java" publishToMavenCentral() signAllPublications() @@ -21,13 +21,14 @@ extensions.configure("mavenPublishing") { } developers { developer { - id.set("sourcegraph") - name.set("Sourcegraph") + name.set("SCIP Maintainers") + organization.set("scip-code") + organizationUrl.set("https://github.com/scip-code") } } scm { connection.set("scm:git:$repositoryUrl.git") - developerConnection.set("scm:git:ssh://git@github.com/sourcegraph/scip-java.git") + developerConnection.set("scm:git:ssh://git@github.com/scip-code/scip-java.git") url.set(repositoryUrl) } } diff --git a/build-logic/src/main/kotlin/scip.project-base.gradle.kts b/build-logic/src/main/kotlin/scip.project-base.gradle.kts index c40da74a0..fb50d3050 100644 --- a/build-logic/src/main/kotlin/scip.project-base.gradle.kts +++ b/build-logic/src/main/kotlin/scip.project-base.gradle.kts @@ -1,4 +1,4 @@ -group = "com.sourcegraph" +group = "org.scip-code" version = providers.gradleProperty("releaseVersion").orElse("0.0.0-SNAPSHOT").get() // Several modules also have Bazel `BUILD` files. On the default macOS diff --git a/docs/design.md b/docs/design.md index 39de7302d..85f37f067 100644 --- a/docs/design.md +++ b/docs/design.md @@ -1,7 +1,4 @@ ---- -id: design -title: Design ---- +# Design This project is implemented as a [Java compiler plugin](https://docs.oracle.com/en/java/javase/11/docs/api/jdk.compiler/com/sun/source/util/Plugin.html) diff --git a/docs/getting-started.md b/docs/getting-started.md index d87f7d0c5..84923bb82 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -1,7 +1,4 @@ ---- -id: getting-started -title: Getting started ---- +# Getting started By following the instructions on this page, you should be able to generate a [SCIP](https://github.com/scip-code/scip) index of your Java codebase using @@ -23,37 +20,37 @@ after we renamed the "Docker container" section into "Docker image". --> ### Docker image -Use the `sourcegraph/scip-java` Docker image to run `scip-java`. +Use the `ghcr.io/scip-code/scip-java` Docker image to run `scip-java`. ```sh -$ docker run -v $(pwd):/sources --env JVM_VERSION=17 sourcegraph/scip-java:latest scip-java index +$ docker run -v $(pwd):/sources --env JVM_VERSION=17 ghcr.io/scip-code/scip-java:latest scip-java index $ src code-intel upload # (optional) upload index to Sourcegraph ``` If everything went OK, a `index.scip` file should exist after the command has finished indexing the project. -> The `sourcegraph/scip-java` Docker image is made available for convenience at -> the cost of performance. The `sourcegraph/scip-java` image is a big download +> The `ghcr.io/scip-code/scip-java` Docker image is made available for convenience at +> the cost of performance. The `ghcr.io/scip-code/scip-java` image is a big download > because it includes pre-installed versions of Java 17, Java 21, and Java 25. -> The `sourcegraph/scip-java` image has slow performance because it needs to +> The `ghcr.io/scip-code/scip-java` image has slow performance because it needs to > download all external dependencies of your codebase on every invocation. > > For better performance, we recommend using your own Docker image together with > the [Java launcher](#java-launcher) option. -By default, the `sourcegraph/scip-java` Docker image tries Java 21 and falls +By default, the `ghcr.io/scip-code/scip-java` Docker image tries Java 21 and falls back to Java 17. Use the following commands to select a specific JVM version: ```sh # Java 17 -docker run -v $(pwd):/sources --env JVM_VERSION=17 sourcegraph/scip-java:latest scip-java index +docker run -v $(pwd):/sources --env JVM_VERSION=17 ghcr.io/scip-code/scip-java:latest scip-java index # Java 21 -docker run -v $(pwd):/sources --env JVM_VERSION=21 sourcegraph/scip-java:latest scip-java index +docker run -v $(pwd):/sources --env JVM_VERSION=21 ghcr.io/scip-code/scip-java:latest scip-java index # Java 25 -docker run -v $(pwd):/sources --env JVM_VERSION=25 sourcegraph/scip-java:latest scip-java index +docker run -v $(pwd):/sources --env JVM_VERSION=25 ghcr.io/scip-code/scip-java:latest scip-java index ``` @@ -66,11 +63,11 @@ Docker image with a pre-installed Java version (JDK 17 or newer). # macOS/Linux curl -fLo coursier https://git.io/coursier-cli \ && chmod +x coursier \ - && ./coursier launch com.sourcegraph:scip-java:@STABLE_VERSION@ -- --help + && ./coursier launch org.scip-code:scip-java:@STABLE_VERSION@ -- --help # macOS Homebrew brew install coursier/formulas/coursier \ - && coursier launch com.sourcegraph:scip-java:@STABLE_VERSION@ -- --help + && coursier launch org.scip-code:scip-java:@STABLE_VERSION@ -- --help ``` The Java launcher uses @@ -93,7 +90,7 @@ binary. # macOS/Linux curl -fLo coursier https://git.io/coursier-cli \ && chmod +x coursier \ - && ./coursier bootstrap --standalone -o scip-java com.sourcegraph:scip-java:@STABLE_VERSION@ --main com.sourcegraph.scip_java.ScipJava + && ./coursier bootstrap --standalone -o scip-java org.scip-code:scip-java:@STABLE_VERSION@ --main org.scip_code.scip_java.ScipJava ./scip-java --help ``` @@ -106,21 +103,21 @@ installation. The `scip-java` command-line interface is published to Maven Central. You can run the command-line interface as a library by directly invoking the `main()` -method on the `com.sourcegraph.scip_java.ScipJava` class. +method on the `org.scip_code.scip_java.ScipJava` class. -[![](https://img.shields.io/maven-central/v/com.sourcegraph/scip-java)](https://repo1.maven.org/maven2/com/sourcegraph/scip-java/) +[![](https://img.shields.io/maven-central/v/org.scip-code/scip-java)](https://repo1.maven.org/maven2/org/scip-code/scip-java/) If you're using Gradle. ```groovy -implementation group: 'com.sourcegraph', name: 'scip-java', version: '@STABLE_VERSION@' +implementation group: 'org.scip-code', name: 'scip-java', version: '@STABLE_VERSION@' ``` If you're using Maven. ```xml - com.sourcegraph + org.scip-code scip-java @STABLE_VERSION@ @@ -183,8 +180,8 @@ for detailed setup options. Run `scip-java index --help` to learn more about the available command-line options. -```scala mdoc:passthrough -com.sourcegraph.scip_java.ScipJava.INSTANCE.printHelp(Console.out) +```scala +org.scip_code.scip_java.ScipJava.INSTANCE.printHelp(Console.out) ``` ## Supported programming languages @@ -224,7 +221,7 @@ For Java 17 and newer versions, the following JVM options are required: ### Kotlin The Kotlin support in scip-java is less mature compared to the Java support. -Don't hesitate to report issues at https://github.com/sourcegraph/scip-java if +Don't hesitate to report issues at https://github.com/scip-code/scip-java if you encounter issues using the Kotlin support. ## Supported build tools @@ -242,9 +239,9 @@ free to subscribe to the tracking issues to receive updates on your build tool. | ---------- | ---- | ------ | -------------------------------------------------------------------------------- | | Maven | ✅ | ❌ | | | Gradle | ✅ | ✅ | | -| Ant | ❌ | ❌ | [sourcegraph/scip-java#305](https://github.com/sourcegraph/scip-java/issues/305) | +| Ant | ❌ | ❌ | [scip-code/scip-java#305](https://github.com/scip-code/scip-java/issues/305) | | Bazel | ✅ | ❌ | | -| Buck | ❌ | ❌ | [sourcegraph/scip-java#99](https://github.com/sourcegraph/scip-java/issues/99) | +| Buck | ❌ | ❌ | [scip-code/scip-java#99](https://github.com/scip-code/scip-java/issues/99) | **✅**: automatic indexing is fully supported. Please report a bug if the `scip-java index` command does not work on your codebase. @@ -273,7 +270,7 @@ The following Gradle integrations are not yet supported: | Integration | Supported | Tracking issue | | ----------- | --------- | -------------------------------------------------------------------------------- | -| Android | ❌ | [sourcegraph/scip-java#177](https://github.com/sourcegraph/scip-java/issues/177) | +| Android | ❌ | [scip-code/scip-java#177](https://github.com/scip-code/scip-java/issues/177) | | Kotlin | ✅ | | ### Maven @@ -286,14 +283,14 @@ The following Maven integrations are not yet supported: | Integration | Supported | Tracking issue | | ------------------- | --------- | -------------------------------------------------------------------------------- | -| kotlin-maven-plugin | ❌ | [sourcegraph/scip-java#304](https://github.com/sourcegraph/scip-java/issues/304) | +| kotlin-maven-plugin | ❌ | [scip-code/scip-java#304](https://github.com/scip-code/scip-java/issues/304) | ### Bazel There are two approaches to index Bazel/Java codebases: automatic and manual. Don't hesitate to open an issue in the -[scip-java repository](https://github.com/sourcegraph/scip-java) if you have any +[scip-java repository](https://github.com/scip-code/scip-java) if you have any questions about using scip-java with Bazel builds. #### Automatic - `aspect` @@ -322,13 +319,13 @@ requires the absolute path to the `scip-java` binary. It's possible to index Bazel codebases by integrating scip-java directly into the build configuration. To achieve this, scip-java must be configured in -`WORKSPACE` and `BUILD` files. The scip-java repository contains an example for +`MODULE.bazel` and `BUILD` files. The scip-java repository contains an example for how to configure everything, including how to build scip-java itself from source. -- [WORKSPACE](https://github.com/sourcegraph/scip-java/blob/main/examples/bazel-example/WORKSPACE): +- [MODULE.bazel](../examples/bazel-example/MODULE.bazel): adds the required dependencies to be able to run scip-java itself. -- [BUILD](https://github.com/sourcegraph/scip-java/blob/main/examples/bazel-example/src/main/java/example/BUILD): +- [BUILD](../examples/bazel-example/src/main/java/example/BUILD): configured `java_library` and `java_binary` targets to be indexed with scip-java. @@ -344,7 +341,7 @@ Next, run the following command to generate the SCIP index (`index.scip`). bazel run @scip_java//scip-aggregator:bazel -- --sourceroot $PWD # (optional) Validate that SCIP files were generated. -# The command below works for the `examples/bazel-example` directory in the sourcegraph/scip-java repository. +# The command below works for the `examples/bazel-example` directory in the scip-code/scip-java repository. ❯ jar tf bazel-bin/src/main/java/example/libexample.jar | grep scip$ META-INF/scip/src/main/java/example/Example.java.scip ``` diff --git a/docs/manual-configuration.md b/docs/manual-configuration.md index 5e74fc18a..fd64a38df 100644 --- a/docs/manual-configuration.md +++ b/docs/manual-configuration.md @@ -1,7 +1,4 @@ ---- -id: manual-configuration -title: Manual configuration ---- +# Manual configuration The `scip-java index` command does a best-effort to automatically index a given codebase. The automatic step may not always work. The purpose of this page is to @@ -25,13 +22,13 @@ The second phase is quite simple to configure and it usually runs very fast. The SCIP compiler plugin is published to Maven Central as a zero-dependency Java library that you can install like any normal dependency. -[![](https://img.shields.io/maven-central/v/com.sourcegraph/scip-javac)](https://repo1.maven.org/maven2/com/sourcegraph/scip-javac/) +[![](https://img.shields.io/maven-central/v/org.scip-code/scip-javac)](https://repo1.maven.org/maven2/org/scip-code/scip-javac/) Use `curl` to download the compiler plugin jar file manually so that it can be added to the `javac -classpath` option. ```sh -curl -Lo scip-javac.jar https://repo1.maven.org/maven2/com/sourcegraph/scip-javac/@STABLE_VERSION@/scip-javac-@STABLE_VERSION@.jar +curl -Lo scip-javac.jar https://repo1.maven.org/maven2/org/scip-code/scip-javac/@STABLE_VERSION@/scip-javac-@STABLE_VERSION@.jar javac -classpath scip-javac.jar MyApplication.java ``` @@ -39,16 +36,16 @@ If you're using Gradle. ```groovy // Option 1: if you are not using annotation processors -compileOnly 'com.sourcegraph:scip-javac:@STABLE_VERSION@' +compileOnly 'org.scip-code:scip-javac:@STABLE_VERSION@' // Option 2: if you are using annotation processors -annotationProcessor 'com.sourcegraph:scip-javac:@STABLE_VERSION@' +annotationProcessor 'org.scip-code:scip-javac:@STABLE_VERSION@' ``` If you're using Maven. ```xml - com.sourcegraph + org.scip-code scip-javac @STABLE_VERSION@ @@ -173,27 +170,27 @@ plugin that can dump the project's dependencies in a format that scip-java under You can either use it directly from commandline: ``` -$ mvn com.sourcegraph:scip-maven-plugin:@STABLE_VERSION@:sourcegraphDependencies +$ mvn org.scip-code:scip-maven-plugin:@STABLE_VERSION@:dependencies ``` Or add it to your build like any other maven plugin: ```xml - com.sourcegraph + org.scip-code scip-maven-plugin @STABLE_VERSION@ - sourcegraphDependencies + dependencies ``` -Which allows you to invoke it by simply running `mvn sourcegraph:sourcegraphDependencies`. +Which allows you to invoke it by simply running `mvn scip:dependencies`. Cross-repository navigation is a feature that allows "goto definition" and "find references" to show results from multiple repositories. @@ -211,4 +208,3 @@ files into a single SCIP index. ❯ file index.scip index.scip: JSON data ``` - diff --git a/examples/maven-example/pom.xml b/examples/maven-example/pom.xml index 340b1ec2f..01184055b 100644 --- a/examples/maven-example/pom.xml +++ b/examples/maven-example/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.sourcegraph + org.scip-code example ${revision} @@ -27,7 +27,7 @@ test - com.sourcegraph + org.scip-code scip-javac ${scip-java.version} @@ -81,13 +81,13 @@ 3.0.0 - com.sourcegraph + org.scip-code scip-maven-plugin ${scip-java.version} - sourcegraphDependencies + dependencies diff --git a/scip-aggregator/BUILD b/scip-aggregator/BUILD index e48175189..b8065f6c5 100644 --- a/scip-aggregator/BUILD +++ b/scip-aggregator/BUILD @@ -8,7 +8,7 @@ package( java_binary( name = "bazel", - main_class = "com.sourcegraph.scip_aggregator.BazelBuildTool", + main_class = "org.scip_code.scip_java.aggregator.BazelBuildTool", runtime_deps = [ ":scip-aggregator", ], diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelBuildTool.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/BazelBuildTool.java similarity index 98% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelBuildTool.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/BazelBuildTool.java index 7c26518eb..842c768c9 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelBuildTool.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/BazelBuildTool.java @@ -1,6 +1,5 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; -import com.sourcegraph.scip_java.Bazelbuild; import java.io.*; import java.nio.file.FileSystems; import java.nio.file.Files; @@ -10,6 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.scip_code.scip.ToolInfo; +import org.scip_code.scip_java.aggregator.bazel.Bazelbuild; public class BazelBuildTool { diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelOptions.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/BazelOptions.java similarity index 99% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelOptions.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/BazelOptions.java index 84b7b7e81..e9743de24 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/BazelOptions.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/BazelOptions.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import java.io.IOException; import java.nio.file.*; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/InputStreamBytes.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/InputStreamBytes.java similarity index 92% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/InputStreamBytes.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/InputStreamBytes.java index 0816cbfa3..b1e4e152a 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/InputStreamBytes.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/InputStreamBytes.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/JdkPackage.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/JdkPackage.java similarity index 96% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/JdkPackage.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/JdkPackage.java index 320cad0d8..ac6724cd7 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/JdkPackage.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/JdkPackage.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; public class JdkPackage extends Package { public final String version; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MavenPackage.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/MavenPackage.java similarity index 95% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MavenPackage.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/MavenPackage.java index bbb228ca1..d9c9f2787 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MavenPackage.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/MavenPackage.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import java.nio.file.Path; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MessageOnlyException.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/MessageOnlyException.java similarity index 90% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MessageOnlyException.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/MessageOnlyException.java index 2aeaf2cf3..01480788a 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/MessageOnlyException.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/MessageOnlyException.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; /** * Exception that doesn't fill out the stack trace, it only prints out the message. diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/Package.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/Package.java similarity index 93% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/Package.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/Package.java index f87b81ede..78678d138 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/Package.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/Package.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; public abstract class Package { public static final Package EMPTY = diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/PackageTable.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/PackageTable.java similarity index 98% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/PackageTable.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/PackageTable.java index e032e6d77..423a6aea0 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/PackageTable.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/PackageTable.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import java.io.IOException; import java.net.URL; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregator.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregator.java similarity index 98% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregator.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregator.java index 845d4d5fb..857f4b2e0 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregator.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregator.java @@ -1,7 +1,6 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import com.google.protobuf.CodedInputStream; -import com.sourcegraph.scip.ScipSymbols; import java.io.IOException; import java.nio.file.FileSystems; import java.nio.file.FileVisitResult; @@ -29,6 +28,7 @@ import org.scip_code.scip.SymbolInformation; import org.scip_code.scip.TextEncoding; import org.scip_code.scip.ToolInfo; +import org.scip_code.scip_java.shared.ScipSymbols; /** * Aggregates per-source SCIP shards (one {@link Index} per {@code *.scip} file emitted by the @@ -73,7 +73,7 @@ private void run() throws IOException { .error( "No SCIP shards found. This typically means that `scip-java` is unable to" + " automatically index this codebase. If you are using Gradle or Maven, please" - + " report an issue to https://github.com/sourcegraph/scip-java and include steps" + + " report an issue to https://github.com/scip-code/scip-java and include steps" + " to reproduce. If you are using a different build tool, make sure that you" + " have followed all of the manual configuration steps."); return; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorOptions.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregatorOptions.java similarity index 91% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorOptions.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregatorOptions.java index e0ea3a39d..a779fa37a 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorOptions.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregatorOptions.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import java.nio.file.Path; import java.util.List; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorReporter.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregatorReporter.java similarity index 93% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorReporter.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregatorReporter.java index 907482aeb..cfffa3167 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipAggregatorReporter.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipAggregatorReporter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; /** * API to hook into the event stream of the scip-aggregator command. diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipOutputStream.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipOutputStream.java similarity index 95% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipOutputStream.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipOutputStream.java index d80c2bb67..777b549f5 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipOutputStream.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipOutputStream.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import java.io.IOException; import java.io.OutputStream; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipWriter.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipWriter.java similarity index 96% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipWriter.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipWriter.java index 00266c69f..877868a6f 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/ScipWriter.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/ScipWriter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolDescriptor.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/SymbolDescriptor.java similarity index 94% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolDescriptor.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/SymbolDescriptor.java index 17d4f093c..2406050a7 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolDescriptor.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/SymbolDescriptor.java @@ -1,9 +1,9 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; -import com.sourcegraph.scip.ScipSymbols; -import com.sourcegraph.scip.ScipSymbols.Descriptor; -import com.sourcegraph.scip.ScipSymbols.Descriptor.Kind; import java.util.Optional; +import org.scip_code.scip_java.shared.ScipSymbols; +import org.scip_code.scip_java.shared.ScipSymbols.Descriptor; +import org.scip_code.scip_java.shared.ScipSymbols.Descriptor.Kind; public record SymbolDescriptor(ScipSymbols.Descriptor descriptor, String owner) { diff --git a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/SymbolRewriter.java similarity index 90% rename from scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java rename to scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/SymbolRewriter.java index b3754faa8..264456baf 100644 --- a/scip-aggregator/src/main/java/com/sourcegraph/scip_aggregator/SymbolRewriter.java +++ b/scip-aggregator/src/main/java/org/scip_code/scip_java/aggregator/SymbolRewriter.java @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; -import com.sourcegraph.scip.ScipSymbols; +import org.scip_code.scip_java.shared.ScipSymbols; /** * Rewrites bare descriptor symbols emitted by the compiler plugins (e.g. {@code diff --git a/scip-aggregator/src/main/protobuf/bazelbuild.proto b/scip-aggregator/src/main/protobuf/bazelbuild.proto index f95dbc705..29cbb8a02 100644 --- a/scip-aggregator/src/main/protobuf/bazelbuild.proto +++ b/scip-aggregator/src/main/protobuf/bazelbuild.proto @@ -21,7 +21,7 @@ package bazel_query; // option cc_api_version = 2; // option java_api_version = 1; -option java_package = "com.sourcegraph.scip_java"; +option java_package = "org.scip_code.scip_java.aggregator.bazel"; message License { repeated string license_type = 1; @@ -528,4 +528,4 @@ message RuleDefinition { message BuildLanguage { // Only contains documented rule definitions repeated RuleDefinition rule = 1; -} \ No newline at end of file +} diff --git a/scip-aggregator/src/test/java/com/sourcegraph/scip_aggregator/JdkPackageTest.java b/scip-aggregator/src/test/java/org/scip_code/scip_java/aggregator/JdkPackageTest.java similarity index 91% rename from scip-aggregator/src/test/java/com/sourcegraph/scip_aggregator/JdkPackageTest.java rename to scip-aggregator/src/test/java/org/scip_code/scip_java/aggregator/JdkPackageTest.java index 9f05bf397..e429aba94 100644 --- a/scip-aggregator/src/test/java/com/sourcegraph/scip_aggregator/JdkPackageTest.java +++ b/scip-aggregator/src/test/java/org/scip_code/scip_java/aggregator/JdkPackageTest.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/scip-aggregator/src/test/java/com/sourcegraph/scip_aggregator/SymbolDescriptorTest.java b/scip-aggregator/src/test/java/org/scip_code/scip_java/aggregator/SymbolDescriptorTest.java similarity index 93% rename from scip-aggregator/src/test/java/com/sourcegraph/scip_aggregator/SymbolDescriptorTest.java rename to scip-aggregator/src/test/java/org/scip_code/scip_java/aggregator/SymbolDescriptorTest.java index 58d49f804..e0c2caa4d 100644 --- a/scip-aggregator/src/test/java/com/sourcegraph/scip_aggregator/SymbolDescriptorTest.java +++ b/scip-aggregator/src/test/java/org/scip_code/scip_java/aggregator/SymbolDescriptorTest.java @@ -1,9 +1,9 @@ -package com.sourcegraph.scip_aggregator; +package org.scip_code.scip_java.aggregator; import static org.junit.jupiter.api.Assertions.assertEquals; -import com.sourcegraph.scip.ScipSymbols.Descriptor.Kind; import org.junit.jupiter.api.Test; +import org.scip_code.scip_java.shared.ScipSymbols.Descriptor.Kind; /** * Colocated unit test for {@link SymbolDescriptor#parseFromSymbol}. Migrated from the former Scala diff --git a/scip-gradle-plugin/src/main/java/com/sourcegraph/gradle/scip/ScipGradlePlugin.java b/scip-gradle-plugin/src/main/java/org/scip_code/scip_java/gradle/ScipGradlePlugin.java similarity index 99% rename from scip-gradle-plugin/src/main/java/com/sourcegraph/gradle/scip/ScipGradlePlugin.java rename to scip-gradle-plugin/src/main/java/org/scip_code/scip_java/gradle/ScipGradlePlugin.java index 8d264bb19..6d5bac22d 100644 --- a/scip-gradle-plugin/src/main/java/com/sourcegraph/gradle/scip/ScipGradlePlugin.java +++ b/scip-gradle-plugin/src/main/java/org/scip_code/scip_java/gradle/ScipGradlePlugin.java @@ -1,4 +1,4 @@ -package com.sourcegraph.gradle.scip; +package org.scip_code.scip_java.gradle; import java.util.ArrayList; import java.util.List; diff --git a/scip-gradle-plugin/src/main/java/com/sourcegraph/gradle/scip/WriteDependencies.java b/scip-gradle-plugin/src/main/java/org/scip_code/scip_java/gradle/WriteDependencies.java similarity index 99% rename from scip-gradle-plugin/src/main/java/com/sourcegraph/gradle/scip/WriteDependencies.java rename to scip-gradle-plugin/src/main/java/org/scip_code/scip_java/gradle/WriteDependencies.java index 169f49276..1993d2be6 100644 --- a/scip-gradle-plugin/src/main/java/com/sourcegraph/gradle/scip/WriteDependencies.java +++ b/scip-gradle-plugin/src/main/java/org/scip_code/scip_java/gradle/WriteDependencies.java @@ -1,4 +1,4 @@ -package com.sourcegraph.gradle.scip; +package org.scip_code.scip_java.gradle; import java.io.File; import java.io.IOException; diff --git a/scip-java/build.gradle.kts b/scip-java/build.gradle.kts index 15f723d4c..835e24adc 100644 --- a/scip-java/build.gradle.kts +++ b/scip-java/build.gradle.kts @@ -1,6 +1,6 @@ -import com.sourcegraph.buildlogic.JavacInternals -import com.sourcegraph.buildlogic.registerGeneratedFile -import com.sourcegraph.buildlogic.shadowJarArtifact +import org.scip_code.scip_java.buildlogic.JavacInternals +import org.scip_code.scip_java.buildlogic.registerGeneratedFile +import org.scip_code.scip_java.buildlogic.shadowJarArtifact plugins { id("scip.java-base") @@ -36,7 +36,7 @@ tasks.named("test") { } application { - mainClass.set("com.sourcegraph.scip_java.ScipJava") + mainClass.set("org.scip_code.scip_java.ScipJava") } val generateEmbeddedResources = tasks.register("generateEmbeddedResources") { diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/CliEnvironment.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/CliEnvironment.kt similarity index 96% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/CliEnvironment.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/CliEnvironment.kt index 51e3f62da..e9d821e81 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/CliEnvironment.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/CliEnvironment.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java +package org.scip_code.scip_java import java.io.PrintStream import java.nio.file.Path diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/CliReporter.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/CliReporter.kt similarity index 96% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/CliReporter.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/CliReporter.kt index 9fcd5bdd8..c5582f2e0 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/CliReporter.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/CliReporter.kt @@ -1,8 +1,8 @@ -package com.sourcegraph.scip_java +package org.scip_code.scip_java -import com.sourcegraph.scip_aggregator.ScipAggregatorReporter import java.nio.file.NoSuchFileException import java.util.concurrent.atomic.AtomicInteger +import org.scip_code.scip_java.aggregator.ScipAggregatorReporter /** * Console reporter: `info` goes to stdout, `warning`/`error` to stderr. Doubles as the diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/Embedded.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/Embedded.kt similarity index 97% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/Embedded.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/Embedded.kt index d7400ac3a..caf9b4f50 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/Embedded.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/Embedded.kt @@ -1,11 +1,11 @@ -package com.sourcegraph.scip_java +package org.scip_code.scip_java -import com.sourcegraph.scip_java.buildtools.ProcessResult import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Path import java.nio.file.StandardCopyOption import java.util.Properties +import org.scip_code.scip_java.buildtools.ProcessResult object Embedded { diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipJava.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/ScipJava.kt similarity index 95% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipJava.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/ScipJava.kt index bd69ca9e1..a15ba62a4 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipJava.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/ScipJava.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java +package org.scip_code.scip_java import java.io.PrintStream diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipJavaApp.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/ScipJavaApp.kt similarity index 95% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipJavaApp.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/ScipJavaApp.kt index 3e073b94d..77a51fd39 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/ScipJavaApp.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/ScipJavaApp.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java +package org.scip_code.scip_java import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.CliktError @@ -11,12 +11,12 @@ import com.github.ajalt.clikt.core.findOrSetObject import com.github.ajalt.clikt.core.parse import com.github.ajalt.clikt.core.subcommands import com.github.ajalt.clikt.parameters.options.versionOption -import com.sourcegraph.scip_java.buildtools.ProcessResult -import com.sourcegraph.scip_java.buildtools.ProcessRunner -import com.sourcegraph.scip_java.commands.AggregateCommand -import com.sourcegraph.scip_java.commands.IndexCommand -import com.sourcegraph.scip_java.commands.SnapshotCommand import java.nio.file.Paths +import org.scip_code.scip_java.buildtools.ProcessResult +import org.scip_code.scip_java.buildtools.ProcessRunner +import org.scip_code.scip_java.commands.AggregateCommand +import org.scip_code.scip_java.commands.IndexCommand +import org.scip_code.scip_java.commands.SnapshotCommand /** * Stateful, mutable container for the scip-java CLI runtime. Tests inject a fresh environment (with diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/BazelBuildTool.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/BazelBuildTool.kt similarity index 98% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/BazelBuildTool.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/BazelBuildTool.kt index 0a16db958..616b5e116 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/BazelBuildTool.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/BazelBuildTool.kt @@ -1,7 +1,5 @@ -package com.sourcegraph.scip_java.buildtools +package org.scip_code.scip_java.buildtools -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand import java.io.File import java.nio.charset.StandardCharsets import java.nio.file.FileSystems @@ -12,6 +10,8 @@ import java.nio.file.Paths import java.nio.file.SimpleFileVisitor import java.nio.file.StandardOpenOption import java.nio.file.attribute.BasicFileAttributes +import org.scip_code.scip_java.Embedded +import org.scip_code.scip_java.commands.IndexCommand class BazelBuildTool(index: IndexCommand) : BuildTool("Bazel", index) { diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/BuildTool.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/BuildTool.kt similarity index 93% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/BuildTool.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/BuildTool.kt index 02ca35043..25698cbba 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/BuildTool.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/BuildTool.kt @@ -1,9 +1,9 @@ -package com.sourcegraph.scip_java.buildtools +package org.scip_code.scip_java.buildtools -import com.sourcegraph.scip_java.commands.AggregateRunner -import com.sourcegraph.scip_java.commands.IndexCommand import java.nio.file.Files import java.nio.file.Path +import org.scip_code.scip_java.commands.AggregateRunner +import org.scip_code.scip_java.commands.IndexCommand /** A build tool such as Gradle, Maven or Bazel. */ abstract class BuildTool(val name: String, protected val index: IndexCommand) { diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ClasspathEntry.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ClasspathEntry.kt similarity index 98% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ClasspathEntry.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ClasspathEntry.kt index c44db6e06..922bbadfb 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ClasspathEntry.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ClasspathEntry.kt @@ -1,12 +1,12 @@ -package com.sourcegraph.scip_java.buildtools +package org.scip_code.scip_java.buildtools -import com.sourcegraph.scip_aggregator.MavenPackage import java.io.File import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths import javax.xml.parsers.DocumentBuilderFactory +import org.scip_code.scip_java.aggregator.MavenPackage import org.w3c.dom.Element import org.w3c.dom.Node diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/GradleBuildTool.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/GradleBuildTool.kt similarity index 96% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/GradleBuildTool.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/GradleBuildTool.kt index 589585deb..900287442 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/GradleBuildTool.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/GradleBuildTool.kt @@ -1,11 +1,11 @@ -package com.sourcegraph.scip_java.buildtools +package org.scip_code.scip_java.buildtools -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths +import org.scip_code.scip_java.Embedded +import org.scip_code.scip_java.commands.IndexCommand class GradleBuildTool(index: IndexCommand) : BuildTool("Gradle", index) { @@ -113,7 +113,7 @@ This means our SCIP compiler plugin was not attached to one or more JavaCompile } } - import com.sourcegraph.gradle.scip.ScipGradlePlugin + import org.scip_code.scip_java.gradle.ScipGradlePlugin allprojects { project.ext["scipTarget"] = "${targetroot()}" diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/MavenBuildTool.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/MavenBuildTool.kt similarity index 94% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/MavenBuildTool.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/MavenBuildTool.kt index be37f3f91..2b8960b6c 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/MavenBuildTool.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/MavenBuildTool.kt @@ -1,10 +1,10 @@ -package com.sourcegraph.scip_java.buildtools +package org.scip_code.scip_java.buildtools -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths +import org.scip_code.scip_java.Embedded +import org.scip_code.scip_java.commands.IndexCommand class MavenBuildTool(index: IndexCommand) : BuildTool("Maven", index) { diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ProcessRunner.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ProcessRunner.kt similarity index 97% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ProcessRunner.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ProcessRunner.kt index 7c3791ec7..2a9189cb6 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ProcessRunner.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ProcessRunner.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.buildtools +package org.scip_code.scip_java.buildtools import java.io.BufferedReader import java.io.InputStreamReader diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ScipBuildTool.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ScipBuildTool.kt similarity index 97% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ScipBuildTool.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ScipBuildTool.kt index 35224af3f..2c06f9d41 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/ScipBuildTool.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/ScipBuildTool.kt @@ -1,7 +1,5 @@ -package com.sourcegraph.scip_java.buildtools +package org.scip_code.scip_java.buildtools -import com.sourcegraph.scip_java.Embedded -import com.sourcegraph.scip_java.commands.IndexCommand import java.io.File import java.io.IOException import java.nio.file.FileSystems @@ -27,6 +25,8 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageRenderer import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.config.Services +import org.scip_code.scip_java.Embedded +import org.scip_code.scip_java.commands.IndexCommand /** * A custom build tool that is specifically made for scip-java. @@ -483,10 +483,9 @@ class ScipBuildTool(index: IndexCommand) : BuildTool("SCIP", index) { companion object { // This file is named "lsif-java.json" instead of "scip-java.json" in - // order to preserve compatibility with "JVM dependencies" repos - // (https://docs.sourcegraph.com/integration/jvm). If we rename to - // "scip-java.json" then the git commit SHAs of these repos change - // and old canonical URLs will become 404 links. + // order to preserve compatibility with legacy "JVM dependencies" repos. + // If we rename to "scip-java.json" then the git commit SHAs of these repos + // change and old canonical URLs will become 404 links. val ConfigFileNames = listOf("scip-java.json", "lsif-java.json") val isIgnoredAnnotationProcessor: Set = setOf("org.openjdk.jmh.generators.BenchmarkProcessor") diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/TemporaryFiles.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/TemporaryFiles.kt similarity index 83% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/TemporaryFiles.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/TemporaryFiles.kt index 74f30c1dc..b8f23500b 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/buildtools/TemporaryFiles.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/buildtools/TemporaryFiles.kt @@ -1,8 +1,8 @@ -package com.sourcegraph.scip_java.buildtools +package org.scip_code.scip_java.buildtools -import com.sourcegraph.scip_java.commands.IndexCommand import java.nio.file.Files import java.nio.file.Path +import org.scip_code.scip_java.commands.IndexCommand object TemporaryFiles { fun withDirectory(index: IndexCommand, fn: (Path) -> T): T { diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/AggregateCommand.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/commands/AggregateCommand.kt similarity index 97% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/AggregateCommand.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/commands/AggregateCommand.kt index 4ff360ca5..b6f3237a2 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/AggregateCommand.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/commands/AggregateCommand.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.commands +package org.scip_code.scip_java.commands import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.Context @@ -11,9 +11,9 @@ import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.multiple import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.types.path -import com.sourcegraph.scip_java.ScipJavaApp import java.nio.file.Path import java.nio.file.Paths +import org.scip_code.scip_java.ScipJavaApp /** `scip-java aggregate`: aggregates per-source SCIP shards into a single SCIP index file. */ class AggregateCommand : CliktCommand(name = "aggregate") { diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/AggregateRunner.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/commands/AggregateRunner.kt similarity index 86% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/AggregateRunner.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/commands/AggregateRunner.kt index af5404124..fbce85474 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/AggregateRunner.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/commands/AggregateRunner.kt @@ -1,12 +1,12 @@ -package com.sourcegraph.scip_java.commands +package org.scip_code.scip_java.commands -import com.sourcegraph.scip_aggregator.ScipAggregator -import com.sourcegraph.scip_aggregator.ScipAggregatorOptions -import com.sourcegraph.scip_java.ScipJava -import com.sourcegraph.scip_java.ScipJavaApp -import com.sourcegraph.scip_java.buildtools.ClasspathEntry import java.nio.file.Path import org.scip_code.scip.ToolInfo +import org.scip_code.scip_java.ScipJava +import org.scip_code.scip_java.ScipJavaApp +import org.scip_code.scip_java.aggregator.ScipAggregator +import org.scip_code.scip_java.aggregator.ScipAggregatorOptions +import org.scip_code.scip_java.buildtools.ClasspathEntry /** * Logic backing the `aggregate` command, factored out so build tools can aggregate their targetroot diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/IndexCommand.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/commands/IndexCommand.kt similarity index 98% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/IndexCommand.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/commands/IndexCommand.kt index c5ada3da1..087df3913 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/IndexCommand.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/commands/IndexCommand.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.commands +package org.scip_code.scip_java.commands import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.ProgramResult @@ -10,12 +10,12 @@ import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.multiple import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.types.path -import com.sourcegraph.scip_java.ScipJavaApp -import com.sourcegraph.scip_java.buildtools.BuildTool -import com.sourcegraph.scip_java.buildtools.ScipBuildTool import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths +import org.scip_code.scip_java.ScipJavaApp +import org.scip_code.scip_java.buildtools.BuildTool +import org.scip_code.scip_java.buildtools.ScipBuildTool /** * `scip-java index`: detects a build tool in the current working directory and shells out to it diff --git a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/SnapshotCommand.kt b/scip-java/src/main/kotlin/org/scip_code/scip_java/commands/SnapshotCommand.kt similarity index 97% rename from scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/SnapshotCommand.kt rename to scip-java/src/main/kotlin/org/scip_code/scip_java/commands/SnapshotCommand.kt index 6f27cacd0..52bb2420c 100644 --- a/scip-java/src/main/kotlin/com/sourcegraph/scip_java/commands/SnapshotCommand.kt +++ b/scip-java/src/main/kotlin/org/scip_code/scip_java/commands/SnapshotCommand.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_java.commands +package org.scip_code.scip_java.commands import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.Context @@ -10,8 +10,6 @@ import com.github.ajalt.clikt.parameters.options.default import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.types.path -import com.sourcegraph.scip_java.ScipJavaApp -import com.sourcegraph.scip_java.buildtools.ProcessRunner import java.nio.file.FileSystems import java.nio.file.FileVisitResult import java.nio.file.Files @@ -20,6 +18,8 @@ import java.nio.file.Paths import java.nio.file.SimpleFileVisitor import java.nio.file.attribute.BasicFileAttributes import org.scip_code.scip.Index +import org.scip_code.scip_java.ScipJavaApp +import org.scip_code.scip_java.buildtools.ProcessRunner /** * `scip-java snapshot`: generates annotated snapshots for each `*.scip` file in the given target diff --git a/scip-java/src/main/resources/scip-java/custom-javac.sh b/scip-java/src/main/resources/scip-java/custom-javac.sh index f8c2e6cbb..40081ffc2 100644 --- a/scip-java/src/main/resources/scip-java/custom-javac.sh +++ b/scip-java/src/main/resources/scip-java/custom-javac.sh @@ -32,7 +32,7 @@ java \ -Dscip.output="$NEW_JAVAC_OPTS" \ "-Dscip.old-output=$SCIP_OLD_JAVAC_OPTS" \ -classpath "$SCIP_PLUGINPATH" \ - com.sourcegraph.scip_javac.InjectScipOptions \ + org.scip_code.scip_java.javac.InjectScipOptions \ "$@" javac "${JAVAC_JVM_OPTIONS[@]}" "@$NEW_JAVAC_OPTS" "${LAUNCHER_ARGS[@]}" diff --git a/scip-java/src/test/kotlin/tests/BuildToolHarness.kt b/scip-java/src/test/kotlin/tests/BuildToolHarness.kt index dbe235879..2ea39aa09 100644 --- a/scip-java/src/test/kotlin/tests/BuildToolHarness.kt +++ b/scip-java/src/test/kotlin/tests/BuildToolHarness.kt @@ -1,8 +1,5 @@ package tests -import com.sourcegraph.scip_java.CliEnvironment -import com.sourcegraph.scip_java.ScipJavaApp -import com.sourcegraph.scip_java.buildtools.ClasspathEntry import java.io.ByteArrayOutputStream import java.io.PrintStream import java.nio.charset.StandardCharsets @@ -17,6 +14,9 @@ import kotlin.test.fail import org.junit.jupiter.api.Assumptions.assumeTrue import org.junit.jupiter.api.DynamicTest import org.junit.jupiter.api.DynamicTest.dynamicTest +import org.scip_code.scip_java.CliEnvironment +import org.scip_code.scip_java.ScipJavaApp +import org.scip_code.scip_java.buildtools.ClasspathEntry /** * Base class for build-tool integration tests. Each `check*` helper returns a JUnit 5 diff --git a/scip-java/src/test/kotlin/tests/GradleBuildToolTest.kt b/scip-java/src/test/kotlin/tests/GradleBuildToolTest.kt index 8694a9b16..cfda87c34 100644 --- a/scip-java/src/test/kotlin/tests/GradleBuildToolTest.kt +++ b/scip-java/src/test/kotlin/tests/GradleBuildToolTest.kt @@ -63,7 +63,7 @@ class GradleBuildToolTest : BuildToolHarness() { "publishing", "gradle/publishing", expectedScipFiles = 1, - expectedPackages = "maven:com.sourcegraph:example-library:1.1", + expectedPackages = "maven:org.scip-code:example-library:1.1", ) ) add(checkGradleBuild("basic", "gradle/basic", expectedScipFiles = 2)) diff --git a/scip-java/src/test/kotlin/tests/MavenBuildToolTest.kt b/scip-java/src/test/kotlin/tests/MavenBuildToolTest.kt index e827240ad..7111e369c 100644 --- a/scip-java/src/test/kotlin/tests/MavenBuildToolTest.kt +++ b/scip-java/src/test/kotlin/tests/MavenBuildToolTest.kt @@ -14,9 +14,9 @@ class MavenBuildToolTest : BuildToolHarness() { expectedScipFiles = 2, expectedPackages = """ - |maven:com.sourcegraph:example:1.0-SNAPSHOT |maven:junit:junit:4.11 |maven:org.hamcrest:hamcrest-core:1.3 + |maven:org.scip-code:example:1.0-SNAPSHOT |""" .trimMargin(), ), diff --git a/scip-java/src/test/resources/fixtures/gradle/publishing/build.gradle b/scip-java/src/test/resources/fixtures/gradle/publishing/build.gradle index 8b4f8968a..7d565cc0e 100644 --- a/scip-java/src/test/resources/fixtures/gradle/publishing/build.gradle +++ b/scip-java/src/test/resources/fixtures/gradle/publishing/build.gradle @@ -8,7 +8,7 @@ repositories { publishing { publications { maven(MavenPublication) { - groupId = 'com.sourcegraph' + groupId = 'org.scip-code' artifactId = 'example-library' version = '1.1' } diff --git a/scip-java/src/test/resources/fixtures/maven/basic/pom.xml b/scip-java/src/test/resources/fixtures/maven/basic/pom.xml index a1c3848ec..35719f026 100644 --- a/scip-java/src/test/resources/fixtures/maven/basic/pom.xml +++ b/scip-java/src/test/resources/fixtures/maven/basic/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.sourcegraph + org.scip-code example 1.0-SNAPSHOT diff --git a/scip-javac/build.gradle.kts b/scip-javac/build.gradle.kts index b623f185f..2716d8c2b 100644 --- a/scip-javac/build.gradle.kts +++ b/scip-javac/build.gradle.kts @@ -1,5 +1,5 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import com.sourcegraph.buildlogic.JavacInternals +import org.scip_code.scip_java.buildlogic.JavacInternals plugins { id("scip.java-library") @@ -28,10 +28,10 @@ tasks.named("test") { tasks.named("shadowJar") { mergeServiceFiles() - relocate("com.google", "com.sourcegraph.shaded.com.google") - relocate("google", "com.sourcegraph.shaded.google") - relocate("com.sourcegraph", "com.sourcegraph.shaded.com.sourcegraph") { - exclude("com.sourcegraph.scip_javac.ScipPlugin") - exclude("com.sourcegraph.scip_javac.InjectScipOptions") + relocate("com.google", "org.scip_code.scip_java.shaded.com.google") + relocate("google", "org.scip_code.scip_java.shaded.google") + relocate("org.scip_code.scip_java", "org.scip_code.scip_java.shaded.org.scip_code.scip_java") { + exclude("org.scip_code.scip_java.javac.ScipPlugin") + exclude("org.scip_code.scip_java.javac.InjectScipOptions") } } diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilationUnitException.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/CompilationUnitException.java similarity index 86% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilationUnitException.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/CompilationUnitException.java index 97818fd50..659eb6acf 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilationUnitException.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/CompilationUnitException.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; public class CompilationUnitException extends Throwable { public CompilationUnitException(String compilationUnit, Throwable cause) { diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilerRange.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/CompilerRange.java similarity index 98% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilerRange.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/CompilerRange.java index 1622eb785..95f81607f 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/CompilerRange.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/CompilerRange.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; /** * Describes how to convert a compiler position into SCIP Range. diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/Debugging.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/Debugging.java similarity index 90% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/Debugging.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/Debugging.java index 62f54ac31..380cc2f9c 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/Debugging.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/Debugging.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; /** Utility methods for debugging purposes. */ public final class Debugging { diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/GlobalSymbolsCache.java similarity index 96% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/GlobalSymbolsCache.java index 134c4a4e9..5d3831d0a 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/GlobalSymbolsCache.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/GlobalSymbolsCache.java @@ -1,9 +1,7 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; -import static com.sourcegraph.scip_javac.Debugging.pprint; +import static org.scip_code.scip_java.javac.Debugging.pprint; -import com.sourcegraph.scip.LocalSymbolsCache; -import com.sourcegraph.scip.ScipSymbols; import java.util.ArrayList; import java.util.IdentityHashMap; import javax.lang.model.element.Element; @@ -14,6 +12,8 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.element.TypeParameterElement; import javax.lang.model.element.VariableElement; +import org.scip_code.scip_java.shared.LocalSymbolsCache; +import org.scip_code.scip_java.shared.ScipSymbols; /** Cache of SCIP symbols that can be referenced between files. */ public final class GlobalSymbolsCache { diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/InjectScipOptions.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/InjectScipOptions.java similarity index 95% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/InjectScipOptions.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/InjectScipOptions.java index 1fd9e7cf8..78fd0eba6 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/InjectScipOptions.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/InjectScipOptions.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.io.IOException; import java.io.OutputStream; @@ -19,7 +19,7 @@ public class InjectScipOptions { * NEW_OPTIONS_PATH=$(mktemp) * java -cp scip.jar \ * -Dscip.output=NEW_OPTIONS_PATH \ - * com.sourcegraph.scip_javac.InjectScipOptions $@ + * org.scip_code.scip_java.javac.InjectScipOptions $@ * javac @$NEW_OPTIONS_PATH * * diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/RangeFinder.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/RangeFinder.java similarity index 98% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/RangeFinder.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/RangeFinder.java index 2ce31d395..9dc5733d8 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/RangeFinder.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/RangeFinder.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.util.Optional; import javax.lang.model.element.Element; diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/Result.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/Result.java similarity index 97% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/Result.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/Result.java index 4d53c8fd6..0fc60f66b 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/Result.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/Result.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.util.NoSuchElementException; diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavaSignatureFormatter.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipJavaSignatureFormatter.java similarity index 99% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavaSignatureFormatter.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipJavaSignatureFormatter.java index 2d6aa81b0..7e02d178b 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavaSignatureFormatter.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipJavaSignatureFormatter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import com.sun.source.tree.AnnotationTree; import com.sun.source.tree.AssignmentTree; diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavacOptions.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipJavacOptions.java similarity index 96% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavacOptions.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipJavacOptions.java index 7e35ba8da..9c34b4040 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipJavacOptions.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipJavacOptions.java @@ -1,11 +1,8 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import static javax.tools.StandardLocation.CLASS_OUTPUT; import static javax.tools.StandardLocation.SOURCE_OUTPUT; -import com.sourcegraph.scip.NoRelativePathMode; -import com.sourcegraph.scip.ScipOptions; -import com.sourcegraph.scip.UriScheme; import com.sun.source.util.JavacTask; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -16,6 +13,9 @@ import javax.tools.FileObject; import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; +import org.scip_code.scip_java.shared.NoRelativePathMode; +import org.scip_code.scip_java.shared.ScipOptions; +import org.scip_code.scip_java.shared.UriScheme; /** Settings that can be configured alongside the -Xplugin compiler option. */ public class ScipJavacOptions extends ScipOptions { diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipOptionBuilder.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipOptionBuilder.java similarity index 98% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipOptionBuilder.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipOptionBuilder.java index e67e81581..542af15bd 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipOptionBuilder.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipOptionBuilder.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.io.File; import java.io.IOException; diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipPlugin.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipPlugin.java similarity index 94% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipPlugin.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipPlugin.java index 22d88c3a4..eafaa6e17 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipPlugin.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipPlugin.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import com.sun.source.util.JavacTask; import com.sun.source.util.Plugin; diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipReporter.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipReporter.java similarity index 93% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipReporter.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipReporter.java index e58a2b1c5..abce58233 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipReporter.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipReporter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import com.sun.source.tree.CompilationUnitTree; import com.sun.source.tree.Tree; @@ -26,7 +26,7 @@ public void exception(Throwable e, Tree tree, CompilationUnitTree root) { PrintWriter writer = new PrintWriter(baos); e.printStackTrace(writer); writer.println( - "Please report a bug to https://github.com/sourcegraph/scip-java with the stack trace" + "Please report a bug to https://github.com/scip-code/scip-java with the stack trace" + " above."); trees.printMessage(Diagnostic.Kind.ERROR, baos.toString(), tree, root); } diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipTaskListener.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipTaskListener.java similarity index 94% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipTaskListener.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipTaskListener.java index cb397bb2d..f779d00ab 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipTaskListener.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipTaskListener.java @@ -1,12 +1,5 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; -import com.sourcegraph.scip.LocalSymbolsCache; -import com.sourcegraph.scip.NoRelativePathMode; -import com.sourcegraph.scip.ScipDocumentBuilder; -import com.sourcegraph.scip.ScipShardPaths; -import com.sourcegraph.scip.ScipShardWriter; -import com.sourcegraph.scip.ScipSymbols; -import com.sourcegraph.scip.UriScheme; import com.sun.source.util.JavacTask; import com.sun.source.util.TaskEvent; import com.sun.source.util.TaskListener; @@ -27,6 +20,13 @@ import javax.lang.model.util.Types; import javax.tools.JavaFileObject; import org.scip_code.scip.Document; +import org.scip_code.scip_java.shared.LocalSymbolsCache; +import org.scip_code.scip_java.shared.NoRelativePathMode; +import org.scip_code.scip_java.shared.ScipDocumentBuilder; +import org.scip_code.scip_java.shared.ScipShardPaths; +import org.scip_code.scip_java.shared.ScipShardWriter; +import org.scip_code.scip_java.shared.ScipSymbols; +import org.scip_code.scip_java.shared.UriScheme; /** * Callback hook that emits a per-source SCIP shard once the compiler has finished typechecking a @@ -177,7 +177,7 @@ public static Path absolutePathFromUri(ScipJavacOptions options, JavaFileObject } // Infers the `-sourceroot:` flag from the provided file. - // FIXME: add unit tests https://github.com/sourcegraph/scip-java/issues/444 + // FIXME: add unit tests https://github.com/scip-code/scip-java/issues/444 private void inferBazelSourceroot(JavaFileObject file) { if (options.uriScheme != UriScheme.BAZEL || options.sourceroot != null) return; Path absolutePath = absolutePathFromUri(options, file); diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipVisitor.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipVisitor.java similarity index 98% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipVisitor.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipVisitor.java index a6e70b12e..e64ab66a0 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/ScipVisitor.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/ScipVisitor.java @@ -1,9 +1,5 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; -import com.sourcegraph.scip.LocalSymbolsCache; -import com.sourcegraph.scip.ScipDocumentBuilder; -import com.sourcegraph.scip.ScipRange; -import com.sourcegraph.scip.ScipSymbols; import com.sun.source.tree.AnnotatedTypeTree; import com.sun.source.tree.ClassTree; import com.sun.source.tree.CompilationUnitTree; @@ -49,6 +45,10 @@ import org.scip_code.scip.Signature; import org.scip_code.scip.SymbolInformation; import org.scip_code.scip.SymbolRole; +import org.scip_code.scip_java.shared.LocalSymbolsCache; +import org.scip_code.scip_java.shared.ScipDocumentBuilder; +import org.scip_code.scip_java.shared.ScipRange; +import org.scip_code.scip_java.shared.ScipSymbols; /** * Walks a typechecked compilation unit and feeds SCIP {@link Occurrence}/{@link SymbolInformation} diff --git a/scip-javac/src/main/java/com/sourcegraph/scip_javac/TargetPaths.java b/scip-javac/src/main/java/org/scip_code/scip_java/javac/TargetPaths.java similarity index 68% rename from scip-javac/src/main/java/com/sourcegraph/scip_javac/TargetPaths.java rename to scip-javac/src/main/java/org/scip_code/scip_java/javac/TargetPaths.java index 9ff63decd..ed9da8c29 100644 --- a/scip-javac/src/main/java/com/sourcegraph/scip_javac/TargetPaths.java +++ b/scip-javac/src/main/java/org/scip_code/scip_java/javac/TargetPaths.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.nio.file.Path; diff --git a/scip-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin b/scip-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin index 5e18e862e..640b17351 100644 --- a/scip-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin +++ b/scip-javac/src/main/resources/META-INF/services/com.sun.source.util.Plugin @@ -1 +1 @@ -com.sourcegraph.scip_javac.ScipPlugin \ No newline at end of file +org.scip_code.scip_java.javac.ScipPlugin diff --git a/scip-javac/src/test/java/com/sourcegraph/scip_javac/CompileResult.java b/scip-javac/src/test/java/org/scip_code/scip_java/javac/CompileResult.java similarity index 94% rename from scip-javac/src/test/java/com/sourcegraph/scip_javac/CompileResult.java rename to scip-javac/src/test/java/org/scip_code/scip_java/javac/CompileResult.java index c5064e6e8..5a414cb0d 100644 --- a/scip-javac/src/test/java/com/sourcegraph/scip_javac/CompileResult.java +++ b/scip-javac/src/test/java/org/scip_code/scip_java/javac/CompileResult.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.util.Collections; import java.util.List; diff --git a/scip-javac/src/test/java/com/sourcegraph/scip_javac/JavacClassesDirectoryTest.java b/scip-javac/src/test/java/org/scip_code/scip_java/javac/JavacClassesDirectoryTest.java similarity index 97% rename from scip-javac/src/test/java/com/sourcegraph/scip_javac/JavacClassesDirectoryTest.java rename to scip-javac/src/test/java/org/scip_code/scip_java/javac/JavacClassesDirectoryTest.java index 01f614d33..8a4bbf5fb 100644 --- a/scip-javac/src/test/java/com/sourcegraph/scip_javac/JavacClassesDirectoryTest.java +++ b/scip-javac/src/test/java/org/scip_code/scip_java/javac/JavacClassesDirectoryTest.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleClassFile.java b/scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleClassFile.java similarity index 93% rename from scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleClassFile.java rename to scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleClassFile.java index 2d5835962..b843c8a2c 100644 --- a/scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleClassFile.java +++ b/scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleClassFile.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleFileManager.java b/scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleFileManager.java similarity index 96% rename from scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleFileManager.java rename to scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleFileManager.java index 02b6880db..18124e90a 100644 --- a/scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleFileManager.java +++ b/scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleFileManager.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.net.URI; import java.nio.file.Path; diff --git a/scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleSourceFile.java b/scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleSourceFile.java similarity index 91% rename from scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleSourceFile.java rename to scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleSourceFile.java index 7f7f265b0..117042915 100644 --- a/scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleSourceFile.java +++ b/scip-javac/src/test/java/org/scip_code/scip_java/javac/SimpleSourceFile.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.nio.file.Path; import javax.tools.SimpleJavaFileObject; diff --git a/scip-javac/src/test/java/com/sourcegraph/scip_javac/TestCompiler.java b/scip-javac/src/test/java/org/scip_code/scip_java/javac/TestCompiler.java similarity index 98% rename from scip-javac/src/test/java/com/sourcegraph/scip_javac/TestCompiler.java rename to scip-javac/src/test/java/org/scip_code/scip_java/javac/TestCompiler.java index 9cbe62097..4915f26f2 100644 --- a/scip-javac/src/test/java/com/sourcegraph/scip_javac/TestCompiler.java +++ b/scip-javac/src/test/java/org/scip_code/scip_java/javac/TestCompiler.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; import java.io.IOException; import java.io.StringWriter; diff --git a/scip-javac/src/test/java/com/sourcegraph/scip_javac/VirtualFile.java b/scip-javac/src/test/java/org/scip_code/scip_java/javac/VirtualFile.java similarity index 89% rename from scip-javac/src/test/java/com/sourcegraph/scip_javac/VirtualFile.java rename to scip-javac/src/test/java/org/scip_code/scip_java/javac/VirtualFile.java index a03346ebd..96e78bc91 100644 --- a/scip-javac/src/test/java/com/sourcegraph/scip_javac/VirtualFile.java +++ b/scip-javac/src/test/java/org/scip_code/scip_java/javac/VirtualFile.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_javac; +package org.scip_code.scip_java.javac; /** * Minimal in-memory source file (relative path + text), replacing the former use of scalameta's diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCheckers.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerCheckers.kt similarity index 99% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCheckers.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerCheckers.kt index dbc490fd0..37ece4b57 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCheckers.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerCheckers.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc import java.nio.file.Path import org.jetbrains.kotlin.* diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCommandLineProcessor.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerCommandLineProcessor.kt similarity index 97% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCommandLineProcessor.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerCommandLineProcessor.kt index 4ba5d5b53..45bb987b2 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerCommandLineProcessor.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerCommandLineProcessor.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc import java.nio.file.Path import java.nio.file.Paths diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerFirExtensionRegistrar.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerFirExtensionRegistrar.kt similarity index 77% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerFirExtensionRegistrar.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerFirExtensionRegistrar.kt index 7e6eb7c99..e0d6271de 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerFirExtensionRegistrar.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerFirExtensionRegistrar.kt @@ -1,7 +1,7 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc -import com.sourcegraph.scip.ScipOptions import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar +import org.scip_code.scip_java.shared.ScipOptions class AnalyzerFirExtensionRegistrar(private val options: ScipOptions) : FirExtensionRegistrar() { override fun ExtensionRegistrarContext.configurePlugin() { diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerParamsProvider.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerParamsProvider.kt similarity index 88% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerParamsProvider.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerParamsProvider.kt index 0f6a00a15..38f64ce2a 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerParamsProvider.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerParamsProvider.kt @@ -1,10 +1,10 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc -import com.sourcegraph.scip.ScipOptions import java.nio.file.Path import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.extensions.FirExtensionSessionComponent import org.jetbrains.kotlin.fir.extensions.FirExtensionSessionComponent.Factory +import org.scip_code.scip_java.shared.ScipOptions open class AnalyzerParamsProvider(session: FirSession, val options: ScipOptions) : FirExtensionSessionComponent(session) { diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerRegistrar.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerRegistrar.kt similarity index 93% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerRegistrar.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerRegistrar.kt index 05261664b..289a0cf4e 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/AnalyzerRegistrar.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/AnalyzerRegistrar.kt @@ -1,12 +1,12 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc -import com.sourcegraph.scip.ScipOptions import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter import org.scip_code.scip.Document +import org.scip_code.scip_java.shared.ScipOptions @OptIn(ExperimentalCompilerApi::class) class AnalyzerRegistrar(private val callback: (Document) -> Unit = {}) : CompilerPluginRegistrar() { diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/LineMap.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/LineMap.kt similarity index 97% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/LineMap.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/LineMap.kt index 07e1da9bc..c2da05fdf 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/LineMap.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/LineMap.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc import org.jetbrains.kotlin.KtSourceElement import org.jetbrains.kotlin.com.intellij.navigation.NavigationItem diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/PostAnalysisExtension.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/PostAnalysisExtension.kt similarity index 93% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/PostAnalysisExtension.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/PostAnalysisExtension.kt index 93cbd77e4..54ea38fa6 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/PostAnalysisExtension.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/PostAnalysisExtension.kt @@ -1,7 +1,5 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc -import com.sourcegraph.scip.ScipShardPaths -import com.sourcegraph.scip.ScipShardWriter import java.io.PrintWriter import java.io.Writer import java.nio.file.Path @@ -16,6 +14,8 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.scip_code.scip.Document +import org.scip_code.scip_java.shared.ScipShardPaths +import org.scip_code.scip_java.shared.ScipShardWriter /** * Writes per-source SCIP shards once the FIR checkers have finished and the IR phase begins. @@ -86,7 +86,7 @@ class PostAnalysisExtension( writer.println("Exception in scip-kotlin compiler plugin:") e.printStackTrace(writer) writer.println( - "Please report a bug to https://github.com/sourcegraph/scip-kotlin with the stack trace above." + "Please report a bug to https://github.com/scip-code/scip-java with the stack trace above." ) writer.close() } diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipSymbols.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipSymbols.kt similarity index 95% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipSymbols.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipSymbols.kt index 3eafd31c8..b3ffb4520 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipSymbols.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipSymbols.kt @@ -1,6 +1,6 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc -import com.sourcegraph.scip.ScipSymbols as SharedSymbols +import org.scip_code.scip_java.shared.ScipSymbols as SharedSymbols @JvmInline value class Symbol(private val symbol: String) { diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipTextDocumentBuilder.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipTextDocumentBuilder.kt similarity index 97% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipTextDocumentBuilder.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipTextDocumentBuilder.kt index 9f2c7a542..f767dda2b 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipTextDocumentBuilder.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipTextDocumentBuilder.kt @@ -1,8 +1,5 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc -import com.sourcegraph.scip.ScipDocumentBuilder -import com.sourcegraph.scip.ScipRange -import com.sourcegraph.scip.ScipShardPaths import java.nio.file.Path import java.nio.file.Paths import org.jetbrains.kotlin.KtSourceElement @@ -26,6 +23,9 @@ import org.scip_code.scip.SymbolRole import org.scip_code.scip.relationship import org.scip_code.scip.signature import org.scip_code.scip.symbolInformation +import org.scip_code.scip_java.shared.ScipDocumentBuilder +import org.scip_code.scip_java.shared.ScipRange +import org.scip_code.scip_java.shared.ScipShardPaths /** Builds a SCIP [Document] for a single Kotlin source file. */ class ScipTextDocumentBuilder( diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipVisitor.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipVisitor.kt similarity index 99% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipVisitor.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipVisitor.kt index 958ad1751..80b9866e5 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/ScipVisitor.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/ScipVisitor.kt @@ -1,4 +1,4 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc import java.nio.file.Path import org.jetbrains.kotlin.KtSourceElement diff --git a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/SymbolsCache.kt b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/SymbolsCache.kt similarity index 97% rename from scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/SymbolsCache.kt rename to scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/SymbolsCache.kt index 32c8a21e4..57f5b1b69 100644 --- a/scip-kotlinc/src/main/kotlin/com/sourcegraph/scip_kotlinc/SymbolsCache.kt +++ b/scip-kotlinc/src/main/kotlin/org/scip_code/scip_java/kotlinc/SymbolsCache.kt @@ -1,7 +1,5 @@ -package com.sourcegraph.scip_kotlinc +package org.scip_code.scip_java.kotlinc -import com.sourcegraph.scip.LocalSymbolsCache as SharedLocalSymbolsCache -import com.sourcegraph.scip_kotlinc.ScipSymbolDescriptor.Kind import java.lang.System.err import org.jetbrains.kotlin.fir.analysis.checkers.declaration.isLocalMember import org.jetbrains.kotlin.fir.analysis.checkers.getContainingSymbol @@ -17,6 +15,8 @@ import org.jetbrains.kotlin.fir.symbols.SymbolInternals import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly +import org.scip_code.scip_java.kotlinc.ScipSymbolDescriptor.Kind +import org.scip_code.scip_java.shared.LocalSymbolsCache as SharedLocalSymbolsCache class GlobalSymbolsCache(testing: Boolean = false) : Iterable { private val globals = diff --git a/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor index 3f4c9962e..13fc07284 100644 --- a/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor +++ b/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor @@ -1 +1 @@ -com.sourcegraph.scip_kotlinc.AnalyzerCommandLineProcessor +org.scip_code.scip_java.kotlinc.AnalyzerCommandLineProcessor diff --git a/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar b/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar index b55fc313f..64d92f95c 100644 --- a/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar +++ b/scip-kotlinc/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar @@ -1 +1 @@ -com.sourcegraph.scip_kotlinc.AnalyzerRegistrar \ No newline at end of file +org.scip_code.scip_java.kotlinc.AnalyzerRegistrar diff --git a/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/AnalyzerTest.kt b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/AnalyzerTest.kt similarity index 99% rename from scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/AnalyzerTest.kt rename to scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/AnalyzerTest.kt index 044083a15..35c16bb3f 100644 --- a/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/AnalyzerTest.kt +++ b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/AnalyzerTest.kt @@ -1,6 +1,5 @@ -package com.sourcegraph.scip_kotlinc.test +package org.scip_code.scip_java.kotlinc.test -import com.sourcegraph.scip_kotlinc.* import com.tschuchort.compiletesting.KotlinCompilation import com.tschuchort.compiletesting.PluginOption import com.tschuchort.compiletesting.SourceFile @@ -18,6 +17,7 @@ import org.intellij.lang.annotations.Language import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi import org.junit.jupiter.api.io.TempDir import org.scip_code.scip.Document +import org.scip_code.scip_java.kotlinc.* @OptIn(ExperimentalCompilerApi::class) class AnalyzerTest { diff --git a/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipBuilders.kt b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/ScipBuilders.kt similarity index 97% rename from scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipBuilders.kt rename to scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/ScipBuilders.kt index 369b71acb..1e8ee95a7 100644 --- a/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipBuilders.kt +++ b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/ScipBuilders.kt @@ -1,12 +1,12 @@ -package com.sourcegraph.scip_kotlinc.test +package org.scip_code.scip_java.kotlinc.test -import com.sourcegraph.scip.ScipRange import org.scip_code.scip.Occurrence import org.scip_code.scip.SymbolInformation import org.scip_code.scip.SymbolRole import org.scip_code.scip.relationship import org.scip_code.scip.signature import org.scip_code.scip.symbolInformation +import org.scip_code.scip_java.shared.ScipRange /** * Tiny DSL for building SCIP [Occurrence] / [SymbolInformation] test fixtures with the same shape diff --git a/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipSymbolsTest.kt b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/ScipSymbolsTest.kt similarity index 99% rename from scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipSymbolsTest.kt rename to scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/ScipSymbolsTest.kt index 71e6eb93f..048d33cee 100644 --- a/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/ScipSymbolsTest.kt +++ b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/ScipSymbolsTest.kt @@ -1,11 +1,11 @@ -package com.sourcegraph.scip_kotlinc.test +package org.scip_code.scip_java.kotlinc.test -import com.sourcegraph.scip_kotlinc.* -import com.sourcegraph.scip_kotlinc.test.ExpectedSymbols.ScipData -import com.sourcegraph.scip_kotlinc.test.ExpectedSymbols.SymbolCacheData import com.tschuchort.compiletesting.SourceFile import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi import org.junit.jupiter.api.TestFactory +import org.scip_code.scip_java.kotlinc.* +import org.scip_code.scip_java.kotlinc.test.ExpectedSymbols.ScipData +import org.scip_code.scip_java.kotlinc.test.ExpectedSymbols.SymbolCacheData @ExperimentalCompilerApi class ScipSymbolsTest { diff --git a/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/Utils.kt b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/Utils.kt similarity index 97% rename from scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/Utils.kt rename to scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/Utils.kt index 48836be9d..4576e9893 100644 --- a/scip-kotlinc/src/test/kotlin/com/sourcegraph/scip_kotlinc/test/Utils.kt +++ b/scip-kotlinc/src/test/kotlin/org/scip_code/scip_java/kotlinc/test/Utils.kt @@ -1,8 +1,5 @@ -package com.sourcegraph.scip_kotlinc.test +package org.scip_code.scip_java.kotlinc.test -import com.sourcegraph.scip.ScipOptions -import com.sourcegraph.scip_kotlinc.* -import com.sourcegraph.scip_kotlinc.AnalyzerCheckers.Companion.visitors import com.tschuchort.compiletesting.KotlinCompilation import com.tschuchort.compiletesting.SourceFile import io.kotest.assertions.assertSoftly @@ -31,6 +28,9 @@ import org.junit.jupiter.api.DynamicTest.dynamicTest import org.scip_code.scip.Document import org.scip_code.scip.Occurrence import org.scip_code.scip.SymbolInformation +import org.scip_code.scip_java.kotlinc.* +import org.scip_code.scip_java.kotlinc.AnalyzerCheckers.Companion.visitors +import org.scip_code.scip_java.shared.ScipOptions data class ExpectedSymbols( val testName: String, diff --git a/scip-maven-plugin/src/main/java/com/sourcegraph/maven/DependencyWriterMojo.java b/scip-maven-plugin/src/main/java/org/scip_code/scip_java/maven/DependencyWriterMojo.java similarity index 98% rename from scip-maven-plugin/src/main/java/com/sourcegraph/maven/DependencyWriterMojo.java rename to scip-maven-plugin/src/main/java/org/scip_code/scip_java/maven/DependencyWriterMojo.java index ac5a1437e..de7a22fa7 100644 --- a/scip-maven-plugin/src/main/java/com/sourcegraph/maven/DependencyWriterMojo.java +++ b/scip-maven-plugin/src/main/java/org/scip_code/scip_java/maven/DependencyWriterMojo.java @@ -1,4 +1,4 @@ -package com.sourcegraph.maven; +package org.scip_code.scip_java.maven; import java.io.BufferedWriter; import java.io.IOException; @@ -15,7 +15,7 @@ import org.apache.maven.project.MavenProject; @Mojo( - name = "sourcegraphDependencies", + name = "dependencies", defaultPhase = LifecyclePhase.COMPILE, requiresDependencyResolution = ResolutionScope.TEST, requiresProject = true) diff --git a/scip-maven-plugin/src/main/resources/META-INF/maven/plugin.template.xml b/scip-maven-plugin/src/main/resources/META-INF/maven/plugin.template.xml index 53a594fc3..587791c49 100644 --- a/scip-maven-plugin/src/main/resources/META-INF/maven/plugin.template.xml +++ b/scip-maven-plugin/src/main/resources/META-INF/maven/plugin.template.xml @@ -3,19 +3,19 @@ - Sourcegraph scip-java Maven plugin + scip-java Maven plugin A Maven plugin which exports your project's dependencies in a format scip-java can understand - com.sourcegraph + org.scip-code scip-maven-plugin @VERSION@ - sourcegraph + scip false true 11 3.9.5 - sourcegraphDependencies + dependencies false true false @@ -23,7 +23,7 @@ false true generate-resources - com.sourcegraph.maven.DependencyWriterMojo + org.scip_code.scip_java.maven.DependencyWriterMojo java per-lookup once-per-session diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/LocalSymbolsCache.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/LocalSymbolsCache.java similarity index 94% rename from scip-shared/src/main/java/com/sourcegraph/scip/LocalSymbolsCache.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/LocalSymbolsCache.java index 2fb376938..2c14f59f7 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/LocalSymbolsCache.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/LocalSymbolsCache.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; import java.util.Map; import java.util.function.IntFunction; diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/NoRelativePathMode.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/NoRelativePathMode.java similarity index 97% rename from scip-shared/src/main/java/com/sourcegraph/scip/NoRelativePathMode.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/NoRelativePathMode.java index a92e95fe1..c83526371 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/NoRelativePathMode.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/NoRelativePathMode.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/ScipDocumentBuilder.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipDocumentBuilder.java similarity index 98% rename from scip-shared/src/main/java/com/sourcegraph/scip/ScipDocumentBuilder.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipDocumentBuilder.java index 15eb6bf1d..83e3d2688 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/ScipDocumentBuilder.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipDocumentBuilder.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; import java.util.ArrayList; import java.util.Comparator; diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/ScipOptions.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipOptions.java similarity index 89% rename from scip-shared/src/main/java/com/sourcegraph/scip/ScipOptions.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipOptions.java index 1d82b9a59..5fa23d634 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/ScipOptions.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipOptions.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; import java.nio.file.Path; diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/ScipRange.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipRange.java similarity index 98% rename from scip-shared/src/main/java/com/sourcegraph/scip/ScipRange.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipRange.java index 4424bf737..1a7fc0bc4 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/ScipRange.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipRange.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; import org.scip_code.scip.MultiLineRange; import org.scip_code.scip.Occurrence; diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/ScipShardPaths.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipShardPaths.java similarity index 98% rename from scip-shared/src/main/java/com/sourcegraph/scip/ScipShardPaths.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipShardPaths.java index bf8742e08..10cfe639b 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/ScipShardPaths.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipShardPaths.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; import java.nio.file.Path; import java.util.Iterator; diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/ScipShardWriter.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipShardWriter.java similarity index 95% rename from scip-shared/src/main/java/com/sourcegraph/scip/ScipShardWriter.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipShardWriter.java index 47c4ffee2..7bde9e82d 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/ScipShardWriter.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipShardWriter.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; import java.io.IOException; import java.nio.file.Files; diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/ScipSymbols.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipSymbols.java similarity index 98% rename from scip-shared/src/main/java/com/sourcegraph/scip/ScipSymbols.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipSymbols.java index 065a962b0..ef2dcb9f2 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/ScipSymbols.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/ScipSymbols.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; /** * Utilities to construct SCIP symbols. diff --git a/scip-shared/src/main/java/com/sourcegraph/scip/UriScheme.java b/scip-shared/src/main/java/org/scip_code/scip_java/shared/UriScheme.java similarity index 54% rename from scip-shared/src/main/java/com/sourcegraph/scip/UriScheme.java rename to scip-shared/src/main/java/org/scip_code/scip_java/shared/UriScheme.java index ad1fb1e32..b1e474d15 100644 --- a/scip-shared/src/main/java/com/sourcegraph/scip/UriScheme.java +++ b/scip-shared/src/main/java/org/scip_code/scip_java/shared/UriScheme.java @@ -1,4 +1,4 @@ -package com.sourcegraph.scip; +package org.scip_code.scip_java.shared; public enum UriScheme { DEFAULT, diff --git a/scip-snapshots/build.gradle.kts b/scip-snapshots/build.gradle.kts index 1238d221d..416b806a3 100644 --- a/scip-snapshots/build.gradle.kts +++ b/scip-snapshots/build.gradle.kts @@ -1,5 +1,5 @@ -import com.sourcegraph.buildlogic.JavacInternals -import com.sourcegraph.buildlogic.projectArtifact +import org.scip_code.scip_java.buildlogic.JavacInternals +import org.scip_code.scip_java.buildlogic.projectArtifact plugins { id("scip.java-library") diff --git a/scip-snapshots/cases/java-25/build.gradle.kts b/scip-snapshots/cases/java-25/build.gradle.kts index 9fdbe85ff..6d10f3915 100644 --- a/scip-snapshots/cases/java-25/build.gradle.kts +++ b/scip-snapshots/cases/java-25/build.gradle.kts @@ -1,7 +1,7 @@ -import com.sourcegraph.buildlogic.cleanDirectoryBeforeRunning -import com.sourcegraph.buildlogic.publishDirectoryArtifact -import com.sourcegraph.buildlogic.shadowJarArtifact -import com.sourcegraph.buildlogic.useScipJavac +import org.scip_code.scip_java.buildlogic.cleanDirectoryBeforeRunning +import org.scip_code.scip_java.buildlogic.publishDirectoryArtifact +import org.scip_code.scip_java.buildlogic.shadowJarArtifact +import org.scip_code.scip_java.buildlogic.useScipJavac plugins { id("scip.java-library") diff --git a/scip-snapshots/cases/java/common/build.gradle.kts b/scip-snapshots/cases/java/common/build.gradle.kts index 1949343a7..9ec23e15e 100644 --- a/scip-snapshots/cases/java/common/build.gradle.kts +++ b/scip-snapshots/cases/java/common/build.gradle.kts @@ -1,7 +1,7 @@ -import com.sourcegraph.buildlogic.cleanDirectoryBeforeRunning -import com.sourcegraph.buildlogic.publishDirectoryArtifact -import com.sourcegraph.buildlogic.shadowJarArtifact -import com.sourcegraph.buildlogic.useScipJavac +import org.scip_code.scip_java.buildlogic.cleanDirectoryBeforeRunning +import org.scip_code.scip_java.buildlogic.publishDirectoryArtifact +import org.scip_code.scip_java.buildlogic.shadowJarArtifact +import org.scip_code.scip_java.buildlogic.useScipJavac plugins { id("scip.java-library") diff --git a/scip-snapshots/cases/kotlin/common/build.gradle.kts b/scip-snapshots/cases/kotlin/common/build.gradle.kts index b402fe575..0dc573c2d 100644 --- a/scip-snapshots/cases/kotlin/common/build.gradle.kts +++ b/scip-snapshots/cases/kotlin/common/build.gradle.kts @@ -1,8 +1,8 @@ -import com.sourcegraph.buildlogic.cleanDirectoryBeforeRunning -import com.sourcegraph.buildlogic.publishDirectoryArtifact -import com.sourcegraph.buildlogic.scipKotlincPluginArgs -import com.sourcegraph.buildlogic.shadowJarArtifact -import com.sourcegraph.buildlogic.useScipJavac +import org.scip_code.scip_java.buildlogic.cleanDirectoryBeforeRunning +import org.scip_code.scip_java.buildlogic.publishDirectoryArtifact +import org.scip_code.scip_java.buildlogic.scipKotlincPluginArgs +import org.scip_code.scip_java.buildlogic.shadowJarArtifact +import org.scip_code.scip_java.buildlogic.useScipJavac import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { diff --git a/scip-snapshots/src/main/java/tests/MinimizedSnapshotScipGenerator.java b/scip-snapshots/src/main/java/tests/MinimizedSnapshotScipGenerator.java index 05eb5a6d1..d4f0a00a4 100644 --- a/scip-snapshots/src/main/java/tests/MinimizedSnapshotScipGenerator.java +++ b/scip-snapshots/src/main/java/tests/MinimizedSnapshotScipGenerator.java @@ -1,6 +1,5 @@ package tests; -import com.sourcegraph.scip_java.ScipJava; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.charset.StandardCharsets; @@ -17,6 +16,7 @@ import java.util.stream.Stream; import org.scip_code.scip.Document; import org.scip_code.scip.Index; +import org.scip_code.scip_java.ScipJava; /** * Indexes the {@code scip-snapshots/cases} corpora and renders golden SCIP snapshots. Runtime paths