sourcegraph · olafurpg · Jul 21, 2023
diff --git a/build.sbt b/build.sbt
@@ -112,7 +112,7 @@ lazy val gradlePlugin = project
   .settings(
     name := "semanticdb-gradle",
     scalaVersion := V.scala213,
-    buildInfoPackage := "com.sourcegraph.scip_java",
+    buildInfoPackage := "com.sourcegraph.internal.scip_java",
     publish / skip := true,
     javaToolchainVersion := "8",
     scalacOptions ++= Seq("-target:8", "-release", "8"),
@@ -245,7 +245,7 @@ lazy val cli = project
         "minimalMillVersion" -> V.minimalMillVersion,
         "millScipVersion" -> V.millScipVersion
       ),
-    buildInfoPackage := "com.sourcegraph.scip_java",
+    buildInfoPackage := "com.sourcegraph.internal.scip_java",
     libraryDependencies ++=
       List(
         "io.get-coursier" %% "coursier" % V.coursier,

diff --git a/scip-java-proto/src/main/protobuf/scip.proto b/scip-java-proto/src/main/protobuf/scip.proto
@@ -13,7 +13,7 @@ syntax = "proto3";
 package lib.codeintel.scip;
 
 option go_package = "github.com/sourcegraph/sourcegraph/lib/codeintel/scip/";
-option java_package = "com.sourcegraph";
+option java_package = "com.sourcegraph.internal";
 
 // Index represents a complete SCIP index for a workspace this is rooted at a
 // single directory. An Index message payload can have a large memory footprint

diff --git a/...ala/com/sourcegraph/io/AbsolutePath.scala → ...ourcegraph/internal/io/AbsolutePath.scala b/...ala/com/sourcegraph/io/AbsolutePath.scala → ...ourcegraph/internal/io/AbsolutePath.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.io
+package com.sourcegraph.internal.io
 
 import java.nio.file.Path
 import java.nio.file.Paths

diff --git a/.../com/sourcegraph/io/AutoDeletedFile.scala → ...cegraph/internal/io/AutoDeletedFile.scala b/.../com/sourcegraph/io/AutoDeletedFile.scala → ...cegraph/internal/io/AutoDeletedFile.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.io
+package com.sourcegraph.internal.io
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files

diff --git a/...la/com/sourcegraph/io/DeleteVisitor.scala → ...urcegraph/internal/io/DeleteVisitor.scala b/...la/com/sourcegraph/io/DeleteVisitor.scala → ...urcegraph/internal/io/DeleteVisitor.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.io
+package com.sourcegraph.internal.io
 
 import java.io.IOException
 import java.nio.file.FileVisitResult

diff --git a/.../sourcegraph/scip_java/Dependencies.scala → ...aph/internal/scip_java/Dependencies.scala b/.../sourcegraph/scip_java/Dependencies.scala → ...aph/internal/scip_java/Dependencies.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java
+package com.sourcegraph.internal.scip_java
 
 import java.io.File
 import java.nio.file.Path

diff --git a/.../com/sourcegraph/scip_java/Embedded.scala → ...cegraph/internal/scip_java/Embedded.scala b/.../com/sourcegraph/scip_java/Embedded.scala → ...cegraph/internal/scip_java/Embedded.scala
@@ -1,11 +1,11 @@
-package com.sourcegraph.scip_java
+package com.sourcegraph.internal.scip_java
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.StandardCopyOption
 
-import com.sourcegraph.scip_java.BuildInfo
+import com.sourcegraph.internal.scip_java.BuildInfo
 import moped.reporters.Reporter
 import os.CommandResult
 

diff --git a/.../sourcegraph/scip_java/ScipPrinters.scala → ...aph/internal/scip_java/ScipPrinters.scala b/.../sourcegraph/scip_java/ScipPrinters.scala → ...aph/internal/scip_java/ScipPrinters.scala
@@ -1,12 +1,12 @@
-package com.sourcegraph.scip_java
+package com.sourcegraph.internal.scip_java
 
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.CollectionHasAsScala
 import scala.math.Ordering.Implicits.seqOrdering
 
-import com.sourcegraph.Scip
-import com.sourcegraph.Scip.SymbolRole
-import com.sourcegraph.scip_java.commands.CommentSyntax
+import com.sourcegraph.internal.Scip
+import com.sourcegraph.internal.Scip.SymbolRole
+import com.sourcegraph.internal.scip_java.commands.CommentSyntax
 import moped.reporters.Input
 import moped.reporters.Position
 

diff --git a/...om/sourcegraph/scip_java/ScipSymbol.scala → ...graph/internal/scip_java/ScipSymbol.scala b/...om/sourcegraph/scip_java/ScipSymbol.scala → ...graph/internal/scip_java/ScipSymbol.scala
@@ -1,7 +1,7 @@
-package com.sourcegraph.scip_java
+package com.sourcegraph.internal.scip_java
 
-import com.sourcegraph.scip_semanticdb.SymbolDescriptor
-import com.sourcegraph.semanticdb_javac.SemanticdbSymbols
+import com.sourcegraph.internal.scip_semanticdb.SymbolDescriptor
+import com.sourcegraph.internal.semanticdb_javac.SemanticdbSymbols
 
 sealed abstract class ScipSymbol {}
 final case class LocalScipSymbol(identifier: String) extends ScipSymbol

diff --git a/...scip_java/buildtools/BazelBuildTool.scala → ...scip_java/buildtools/BazelBuildTool.scala b/...scip_java/buildtools/BazelBuildTool.scala → ...scip_java/buildtools/BazelBuildTool.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.FileSystems
@@ -11,9 +11,9 @@ import java.nio.file.attribute.BasicFileAttributes
 
 import scala.collection.mutable.ListBuffer
 
-import com.sourcegraph.io.AbsolutePath
-import com.sourcegraph.scip_java.Embedded
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.io.AbsolutePath
+import com.sourcegraph.internal.scip_java.Embedded
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 import moped.cli.Application
 import os.ProcessOutput.Readlines
 

diff --git a/...raph/scip_java/buildtools/BuildTool.scala → ...rnal/scip_java/buildtools/BuildTool.scala b/...raph/scip_java/buildtools/BuildTool.scala → ...rnal/scip_java/buildtools/BuildTool.scala
@@ -1,9 +1,9 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.file.Files
 import java.nio.file.Path
 
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 import os.CommandResult
 
 /**

diff --git a/...scip_java/buildtools/ClasspathEntry.scala → ...scip_java/buildtools/ClasspathEntry.scala b/...scip_java/buildtools/ClasspathEntry.scala → ...scip_java/buildtools/ClasspathEntry.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.io.File
 import java.nio.charset.StandardCharsets
@@ -9,7 +9,7 @@ import java.nio.file.Paths
 import scala.annotation.tailrec
 import scala.jdk.CollectionConverters._
 
-import com.sourcegraph.scip_semanticdb.MavenPackage
+import com.sourcegraph.internal.scip_semanticdb.MavenPackage
 
 /**
  * Represents a single classpath entry on the classpath of a project, used to

diff --git a/...cip_java/buildtools/GradleBuildTool.scala → ...cip_java/buildtools/GradleBuildTool.scala b/...cip_java/buildtools/GradleBuildTool.scala → ...cip_java/buildtools/GradleBuildTool.scala
@@ -1,15 +1,15 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.charset.StandardCharsets
 import java.nio.file._
 
 import scala.collection.mutable.ListBuffer
 import scala.util.Properties
 
-import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.scip_java.BuildInfo
-import com.sourcegraph.scip_java.Embedded
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.io.DeleteVisitor
+import com.sourcegraph.internal.scip_java.BuildInfo
+import com.sourcegraph.internal.scip_java.Embedded
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 import os.CommandResult
 
 class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
@@ -111,7 +111,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
          |     }
          | }
          |
-         | import com.sourcegraph.gradle.semanticdb.SemanticdbGradlePlugin
+         | import com.sourcegraph.internal.gradle.semanticdb.SemanticdbGradlePlugin
          |
          | allprojects {
          |   project.extra["semanticdbTarget"] = "$targetroot"

diff --git a/..._java/buildtools/GradleJavaCompiler.scala → ..._java/buildtools/GradleJavaCompiler.scala b/..._java/buildtools/GradleJavaCompiler.scala → ..._java/buildtools/GradleJavaCompiler.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
@@ -9,8 +9,8 @@ import java.nio.file.StandardCopyOption
 
 import scala.collection.mutable.ListBuffer
 
-import com.sourcegraph.scip_java.Embedded
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.scip_java.Embedded
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 
 /**
  * Metadata about the Java compiler that is used by a Gradle build.

diff --git a/...ava/buildtools/GradleJavaToolchains.scala → ...ava/buildtools/GradleJavaToolchains.scala b/...ava/buildtools/GradleJavaToolchains.scala → ...ava/buildtools/GradleJavaToolchains.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
@@ -7,8 +7,8 @@ import java.nio.file.Path
 import scala.annotation.tailrec
 import scala.jdk.CollectionConverters._
 
-import com.sourcegraph.scip_java.Embedded
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.scip_java.Embedded
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 import org.intellij.lang.annotations.Language
 
 case class GradleJavaToolchains(

diff --git a/...scip_java/buildtools/MavenBuildTool.scala → ...scip_java/buildtools/MavenBuildTool.scala b/...scip_java/buildtools/MavenBuildTool.scala → ...scip_java/buildtools/MavenBuildTool.scala
@@ -1,13 +1,13 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 
 import scala.collection.mutable.ListBuffer
 
-import com.sourcegraph.scip_java.Embedded
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.scip_java.Embedded
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 import os.CommandResult
 
 class MavenBuildTool(index: IndexCommand) extends BuildTool("Maven", index) {

diff --git a/.../scip_java/buildtools/MillBuildTool.scala → .../scip_java/buildtools/MillBuildTool.scala b/.../scip_java/buildtools/MillBuildTool.scala → .../scip_java/buildtools/MillBuildTool.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.file.Files
 import java.nio.file.Path
@@ -7,8 +7,8 @@ import java.nio.file.StandardCopyOption
 import scala.jdk.CollectionConverters._
 import scala.util.Properties
 
-import com.sourcegraph.scip_java.BuildInfo
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.scip_java.BuildInfo
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 
 class MillBuildTool(index: IndexCommand) extends BuildTool("mill", index) {
 

diff --git a/...h/scip_java/buildtools/SbtBuildTool.scala → ...l/scip_java/buildtools/SbtBuildTool.scala b/...h/scip_java/buildtools/SbtBuildTool.scala → ...l/scip_java/buildtools/SbtBuildTool.scala
@@ -1,14 +1,14 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
 import java.util.Properties
 
 import scala.util.Using
 
-import com.sourcegraph.io.AutoDeletedFile
-import com.sourcegraph.scip_java.BuildInfo
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.io.AutoDeletedFile
+import com.sourcegraph.internal.scip_java.BuildInfo
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 
 class SbtBuildTool(index: IndexCommand) extends BuildTool("sbt", index) {
   override def usedInCurrentDirectory(): Boolean = {

diff --git a/...buildtools/ScalaCompilerClassLoader.scala → ...buildtools/ScalaCompilerClassLoader.scala b/...buildtools/ScalaCompilerClassLoader.scala → ...buildtools/ScalaCompilerClassLoader.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 // Copied from: https://github.com/scalameta/metals/blob/3c83447ec658f87fdccbfb3f0a39fca1cec4ef6e/metals/src/main/scala/scala/meta/internal/metals/PresentationCompilerClassLoader.scala
 
 /**

diff --git a/...h/scip_java/buildtools/ScalaVersion.scala → ...l/scip_java/buildtools/ScalaVersion.scala b/...h/scip_java/buildtools/ScalaVersion.scala → ...l/scip_java/buildtools/ScalaVersion.scala
@@ -1,8 +1,8 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.file.Path
 
-import com.sourcegraph.scip_java.BuildInfo
+import com.sourcegraph.internal.scip_java.BuildInfo
 
 object ScalaVersion {
 

diff --git a/.../scip_java/buildtools/ScipBuildTool.scala → .../scip_java/buildtools/ScipBuildTool.scala b/.../scip_java/buildtools/ScipBuildTool.scala → .../scip_java/buildtools/ScipBuildTool.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.io.File
 import java.io.FileOutputStream
@@ -32,14 +32,14 @@ import scala.util.control.NonFatal
 import scala.meta.pc.PresentationCompiler
 import scala.meta.pc.PresentationCompilerConfig
 
-import com.sourcegraph.io.AbsolutePath
-import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.scip_java.BuildInfo
-import com.sourcegraph.scip_java.Dependencies
-import com.sourcegraph.scip_java.Embedded
-import com.sourcegraph.scip_java.commands.IndexCommand
-import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument
-import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocuments
+import com.sourcegraph.internal.io.AbsolutePath
+import com.sourcegraph.internal.io.DeleteVisitor
+import com.sourcegraph.internal.scip_java.BuildInfo
+import com.sourcegraph.internal.scip_java.Dependencies
+import com.sourcegraph.internal.scip_java.Embedded
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocument
+import com.sourcegraph.internal.semanticdb_javac.Semanticdb.TextDocuments
 import moped.json.DecodingContext
 import moped.json.ErrorResult
 import moped.json.JsonCodec

diff --git a/...p_java/buildtools/SystemJavaVersion.scala → ...p_java/buildtools/SystemJavaVersion.scala b/...p_java/buildtools/SystemJavaVersion.scala → ...p_java/buildtools/SystemJavaVersion.scala
@@ -1,8 +1,8 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.file.Files
 
-import com.sourcegraph.scip_java.Embedded
+import com.sourcegraph.internal.scip_java.Embedded
 
 object SystemJavaVersion {
   // Returns the output of `System.getProperty("java.version")` from a fresh JVM

diff --git a/...scip_java/buildtools/TemporaryFiles.scala → ...scip_java/buildtools/TemporaryFiles.scala b/...scip_java/buildtools/TemporaryFiles.scala → ...scip_java/buildtools/TemporaryFiles.scala
@@ -1,10 +1,10 @@
-package com.sourcegraph.scip_java.buildtools
+package com.sourcegraph.internal.scip_java.buildtools
 
 import java.nio.file.Files
 import java.nio.file.Path
 
-import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.scip_java.commands.IndexCommand
+import com.sourcegraph.internal.io.DeleteVisitor
+import com.sourcegraph.internal.scip_java.commands.IndexCommand
 
 object TemporaryFiles {
   def withDirectory[T](index: IndexCommand)(fn: Path => T): T = {

diff --git a/...ph/scip_java/commands/CommentSyntax.scala → ...al/scip_java/commands/CommentSyntax.scala b/...ph/scip_java/commands/CommentSyntax.scala → ...al/scip_java/commands/CommentSyntax.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.commands
+package com.sourcegraph.internal.scip_java.commands
 
 case class CommentSyntax(value: String) {
   private val map =

diff --git a/...aph/scip_java/commands/IndexCommand.scala → ...nal/scip_java/commands/IndexCommand.scala b/...aph/scip_java/commands/IndexCommand.scala → ...nal/scip_java/commands/IndexCommand.scala
@@ -1,12 +1,12 @@
-package com.sourcegraph.scip_java.commands
+package com.sourcegraph.internal.scip_java.commands
 
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
 
-import com.sourcegraph.io.AbsolutePath
-import com.sourcegraph.scip_java.buildtools.BuildTool
-import com.sourcegraph.scip_java.buildtools.ScipBuildTool
+import com.sourcegraph.internal.io.AbsolutePath
+import com.sourcegraph.internal.scip_java.buildtools.BuildTool
+import com.sourcegraph.internal.scip_java.buildtools.ScipBuildTool
 import fansi.Color
 import moped.annotations._
 import moped.cli.Application

diff --git a/...ava/commands/IndexDependencyCommand.scala → ...ava/commands/IndexDependencyCommand.scala b/...ava/commands/IndexDependencyCommand.scala → ...ava/commands/IndexDependencyCommand.scala
@@ -1,4 +1,4 @@
-package com.sourcegraph.scip_java.commands
+package com.sourcegraph.internal.scip_java.commands
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
@@ -8,10 +8,10 @@ import java.nio.file.StandardCopyOption
 import java.nio.file.StandardOpenOption
 import java.util.jar.JarFile
 
-import com.sourcegraph.io.AbsolutePath
-import com.sourcegraph.io.DeleteVisitor
-import com.sourcegraph.scip_java.Dependencies
-import com.sourcegraph.scip_semanticdb.JavaVersion
+import com.sourcegraph.internal.io.AbsolutePath
+import com.sourcegraph.internal.io.DeleteVisitor
+import com.sourcegraph.internal.scip_java.Dependencies
+import com.sourcegraph.internal.scip_semanticdb.JavaVersion
 import moped.annotations.DeprecatedName
 import moped.annotations.Description
 import moped.annotations.Hidden

diff --git a/...ava/commands/IndexSemanticdbCommand.scala → ...ava/commands/IndexSemanticdbCommand.scala b/...ava/commands/IndexSemanticdbCommand.scala → ...ava/commands/IndexSemanticdbCommand.scala
@@ -1,19 +1,19 @@
-package com.sourcegraph.scip_java.commands
+package com.sourcegraph.internal.scip_java.commands
 
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
 
 import scala.jdk.CollectionConverters._
 
-import com.sourcegraph.io.AbsolutePath
-import com.sourcegraph.lsif_protocol.LsifToolInfo
-import com.sourcegraph.scip_java.BuildInfo
-import com.sourcegraph.scip_java.buildtools.ClasspathEntry
-import com.sourcegraph.scip_semanticdb.ConsoleScipSemanticdbReporter
-import com.sourcegraph.scip_semanticdb.ScipOutputFormat
-import com.sourcegraph.scip_semanticdb.ScipSemanticdb
-import com.sourcegraph.scip_semanticdb.ScipSemanticdbOptions
+import com.sourcegraph.internal.io.AbsolutePath
+import com.sourcegraph.internal.lsif_protocol.LsifToolInfo
+import com.sourcegraph.internal.scip_java.BuildInfo
+import com.sourcegraph.internal.scip_java.buildtools.ClasspathEntry
+import com.sourcegraph.internal.scip_semanticdb.ConsoleScipSemanticdbReporter
+import com.sourcegraph.internal.scip_semanticdb.ScipOutputFormat
+import com.sourcegraph.internal.scip_semanticdb.ScipSemanticdb
+import com.sourcegraph.internal.scip_semanticdb.ScipSemanticdbOptions
 import moped.annotations._
 import moped.cli.Application
 import moped.cli.Command