Remove usage of deprecated methods.

Fixes #123
scalapb · Jun 5, 2016 · 545b0cd · 545b0cd
1 parent e7e5b1e
commit 545b0cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/ProtobufGenerator.scala b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/ProtobufGenerator.scala
@@ -302,7 +302,7 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
     if (field.isMessage) {
         fp.addM(
           s"""output.writeTag(${field.getNumber}, 2)
-             |output.writeRawVarint32($valueExpr.serializedSize)
+             |output.writeUInt32NoTag($valueExpr.serializedSize)
              |$valueExpr.writeTo(output)""")
     } else if (field.isEnum)
         fp.add(s"output.writeEnum(${field.getNumber}, $valueExpr.value)")
@@ -315,7 +315,7 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
   def sizeExpressionForSingleField(field: FieldDescriptor, expr: String): String =
     if (field.isMessage) {
       val size = s"$expr.serializedSize"
-      CodedOutputStream.computeTagSize(field.getNumber) + s" + com.google.protobuf.CodedOutputStream.computeRawVarint32Size($size) + $size"
+      CodedOutputStream.computeTagSize(field.getNumber) + s" + com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag($size) + $size"
     } else if(field.isEnum)
       s"com.google.protobuf.CodedOutputStream.computeEnumSize(${field.getNumber}, ${expr}.value)"
     else {
@@ -370,7 +370,7 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
           .addM(
             s"""if($fieldNameSymbol.nonEmpty) {
                |  val __localsize = ${fieldName}SerializedSize
-               |  __size += $tagSize + com.google.protobuf.CodedOutputStream.computeRawVarint32Size(__localsize) + __localsize
+               |  __size += $tagSize + com.google.protobuf.CodedOutputStream.computeUInt32SizeNoTag(__localsize) + __localsize
                |}""")
       }
     } else throw new RuntimeException("Should not reach here.")
@@ -454,7 +454,7 @@ class ProtobufGenerator(val params: GeneratorParams) extends DescriptorPimps {
             printer.addM(
               s"""if (${fieldNameSymbol}.nonEmpty) {
                  |  output.writeTag(${field.getNumber}, 2)
-                 |  output.writeRawVarint32(${fieldNameSymbol}SerializedSize)
+                 |  output.writeUInt32NoTag(${fieldNameSymbol}SerializedSize)
                  |  ${fieldNameSymbol}.foreach($writeFunc)
                  |};""")
         } else if (field.isRequired) {

diff --git a/scalapb-runtime/shared/src/main/scala/com/trueaccord/scalapb/GeneratedMessageCompanion.scala b/scalapb-runtime/shared/src/main/scala/com/trueaccord/scalapb/GeneratedMessageCompanion.scala
@@ -52,10 +52,10 @@ trait GeneratedMessage extends Serializable {
   def writeDelimitedTo(output: OutputStream): Unit = {
     val serialized: Int = serializedSize
     val bufferSize: Int = LiteParser.preferredCodedOutputStreamBufferSize(
-        CodedOutputStream.computeRawVarint32Size(serialized) + serialized)
+        CodedOutputStream.computeUInt32SizeNoTag(serialized) + serialized)
     val codedOutput: CodedOutputStream =
         CodedOutputStream.newInstance(output, bufferSize)
-    codedOutput.writeRawVarint32(serialized)
+    codedOutput.writeUInt32NoTag(serialized)
     writeTo(codedOutput)
     codedOutput.flush()
   }

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.5.29-SNAPSHOT"
+version in ThisBuild := "0.5.29-SNAPSHOT"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "0.5.29-SNAPSHOT"
		version in ThisBuild := "0.5.29-SNAPSHOT"