Move VarInt to core_impl and change the package name. (#308)

* Move VarInt to core_impl and change the package name.
* Suppress warnings in VarInt.java.

8 files changed, 7 insertions, 8 deletions

diff --git a/checkstyle.xml b/checkstyle.xml
index 45f05489..72ad2fa5 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -215,5 +215,7 @@
             <property name="exceptionVariableName" value="expected"/>
         </module>
         <module name="CommentsIndentation"/>
+        <module name="FileContentsHolder"/>
     </module>
+    <module name="SuppressionCommentFilter"/>
 </module>
diff --git a/core_impl/build.gradle b/core_impl/build.gradle
index afb05135..558c0918 100644
--- a/core_impl/build.gradle
+++ b/core_impl/build.gradle
@@ -2,7 +2,6 @@ description = 'Instrumentation Core Impl'
 
 dependencies {
     compile project(':core'),
-            project(':shared'),
             libraries.guava
 
     compileOnly libraries.auto_value
diff --git a/shared/src/main/java/com/google/io/base/VarInt.java b/core_impl/src/main/java/com/google/instrumentation/internal/VarInt.java
index a2d0ed04..d3d85bf3 100644
--- a/shared/src/main/java/com/google/io/base/VarInt.java
+++ b/core_impl/src/main/java/com/google/instrumentation/internal/VarInt.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.google.io.base;
+package com.google.instrumentation.internal;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
  * Common methods to encode and decode varints and varlongs into ByteBuffers and
  * arrays.
  */
+// CHECKSTYLE:OFF
 public class VarInt {
 
   /**
diff --git a/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java b/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java
index ffd7ea74..108c961c 100644
--- a/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java
+++ b/core_impl/src/main/java/com/google/instrumentation/stats/StatsSerializer.java
@@ -15,7 +15,7 @@ package com.google.instrumentation.stats;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.ByteStreams;
-import com.google.io.base.VarInt;
+import com.google.instrumentation.internal.VarInt;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java b/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java
index 97115fcc..217695a2 100644
--- a/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextFactoryTest.java
@@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import com.google.instrumentation.common.NonThrowingCloseable;
 import com.google.instrumentation.common.SimpleEventQueue;
 import com.google.instrumentation.internal.TestClock;
-import com.google.io.base.VarInt;
+import com.google.instrumentation.internal.VarInt;
 import io.grpc.Context;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextTest.java b/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextTest.java
index a54f786a..7d963b12 100644
--- a/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextTest.java
+++ b/core_impl/src/test/java/com/google/instrumentation/stats/StatsContextTest.java
@@ -23,7 +23,7 @@ import com.google.instrumentation.common.SimpleEventQueue;
 import com.google.instrumentation.internal.TestClock;
 import com.google.instrumentation.stats.View.DistributionView;
 import com.google.instrumentation.stats.View.IntervalView;
-import com.google.io.base.VarInt;
+import com.google.instrumentation.internal.VarInt;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/settings.gradle b/settings.gradle
index 5b0bb480..f826e931 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,14 +4,12 @@ include ":core"
 include ":core_impl"
 include ":core_impl_java"
 include ":core_impl_android"
-include ":shared"
 
 project(':all').projectDir = "$rootDir/all" as File
 project(':core').projectDir = "$rootDir/core" as File
 project(':core_impl').projectDir = "$rootDir/core_impl" as File
 project(':core_impl_java').projectDir = "$rootDir/core_impl_java" as File
 project(':core_impl_android').projectDir = "$rootDir/core_impl_android" as File
-project(':shared').projectDir = "$rootDir/shared" as File
 
 // Java8 projects only
 if (JavaVersion.current().isJava8Compatible()) {
diff --git a/shared/build.gradle b/shared/build.gradle
deleted file mode 100644
index d50d1371..00000000
--- a/shared/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-description = 'Shared'