Merge pull request #458 from sourcegraph/olafurpg/scip-package

Use a better Java package name for generated Protobuf classes

Author: olafurpg

scip-java/src/main/scala/com/sourcegraph/scip_java/buildtools/BazelBuildTool.scala

@@ -6,6 +6,8 @@ import com.sourcegraph.scip_java.commands.IndexCommand
 
 class BazelBuildTool(index: IndexCommand) extends BuildTool("Bazel", index) {
 
+  override def isHidden: Boolean = true
+
   override def usedInCurrentDirectory(): Boolean = {
     Files.isRegularFile(index.workingDirectory.resolve("WORKSPACE"))
   }

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipSemanticdb.java

@@ -7,7 +7,7 @@
 import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence;
 import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role;
 import com.sourcegraph.semanticdb_javac.SemanticdbSymbols;
-import lib.codeintel.scip.Scip;
+import com.sourcegraph.Scip;
 
 import java.io.IOException;
 import java.io.InputStream;

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipWriter.java

@@ -6,7 +6,7 @@
 import com.sourcegraph.lsif_protocol.LsifPosition;
 import com.sourcegraph.semanticdb_javac.Semanticdb;
 import com.sourcegraph.semanticdb_javac.SemanticdbSymbols;
-import lib.codeintel.scip.Scip;
+import com.sourcegraph.Scip;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;

scip-semanticdb/src/main/protobuf/scip.proto

@@ -13,6 +13,7 @@ syntax = "proto3";
 package lib.codeintel.scip;
 
 option go_package = "github.com/sourcegraph/sourcegraph/lib/codeintel/scip/";
+option java_package = "com.sourcegraph";
 
 // 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