Updated to Okio 2.0 release. Since Okio 2.0 is a binary compatible but Kotlin source incompatible, we will bumb our version number too.

Author: erickok

lib/build.gradle

@@ -2,7 +2,7 @@ group 'nl.nl2312'
 version '1.0'
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.2.61'
 
     repositories {
         mavenCentral()
@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile 'com.squareup.okio:okio:1.14.0'
+    compile 'com.squareup.okio:okio:2.0.0'
 
     testCompile 'junit:junit:4.12'
     testCompile 'com.google.truth:truth:0.39'

lib/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

lib/src/main/java/nl/nl2312/okio/base64/Base64Sink.kt

@@ -14,15 +14,15 @@ class Base64Sink(delegate: Sink) : ForwardingSink(delegate) {
 
     override fun write(source: Buffer, byteCount: Long) {
         // Read the requested number of bytes (or all available) from source
-        val bytesToRead = byteCount.coerceAtMost(source.size())
+        val bytesToRead = byteCount.coerceAtMost(source.size)
         val decoded = source.readByteString(bytesToRead)
 
         // Base64-encode
         val encoded = decoded.base64()
 
         val encodedSink = Buffer()
         encodedSink.writeUtf8(encoded)
-        super.write(encodedSink, encodedSink.size())
+        super.write(encodedSink, encodedSink.size)
     }
 
 }

lib/src/main/java/nl/nl2312/okio/base64/Base64Source.kt

@@ -2,6 +2,7 @@ package nl.nl2312.okio.base64
 
 import okio.Buffer
 import okio.ByteString
+import okio.ByteString.Companion.decodeBase64
 import okio.ForwardingSource
 import okio.Source
 
@@ -21,27 +22,27 @@ class Base64Source(source: Source) : ForwardingSource(source) {
         if (bytesRequested >= MAX_REQUEST_LENGTH) throw IllegalArgumentException("bytesRequested > max allowed")
 
         // If we have the requested bytes already buffered, return directly
-        if (decodeBuffer.size() >= bytesRequested) {
+        if (decodeBuffer.size >= bytesRequested) {
             sink.write(decodeBuffer, bytesRequested)
             return bytesRequested
         }
 
         var streamEnded = false
-        while (decodeBuffer.size() < bytesRequested && !streamEnded) {
+        while (decodeBuffer.size < bytesRequested && !streamEnded) {
             val bytesRead = super.read(sourceBuffer, bytesRequested)
             if (bytesRead < 0) {
                 streamEnded = true
             }
 
             // Decode all available blocks
-            val allFullBlocks = BASE64_BLOCK * (sourceBuffer.size() / BASE64_BLOCK)
-            val decoded: ByteString? = ByteString.decodeBase64(sourceBuffer.readUtf8(allFullBlocks))
+            val allFullBlocks = BASE64_BLOCK * (sourceBuffer.size / BASE64_BLOCK)
+            val decoded: ByteString? = sourceBuffer.readUtf8(allFullBlocks).decodeBase64()
             if (decoded == null) throw IllegalStateException("base64 decode failed")
             decodeBuffer.write(decoded)
         }
 
         // Return the requested number of bytes (or all that were available)
-        val bytesToReturn = bytesRequested.coerceAtMost(decodeBuffer.size())
+        val bytesToReturn = bytesRequested.coerceAtMost(decodeBuffer.size)
         sink.write(decodeBuffer, bytesToReturn)
 
         return if (streamEnded) -1 else bytesToReturn

lib/src/main/java/nl/nl2312/okio/cipher/CipherSink.kt

@@ -17,15 +17,15 @@ class CipherSink(
 
     override fun write(source: Buffer, byteCount: Long) {
         // Read the requested number of bytes (or all available) from source
-        val bytesToRead = byteCount.coerceAtMost(source.size())
+        val bytesToRead = byteCount.coerceAtMost(source.size)
         val decrypted = source.readByteArray(bytesToRead)
 
         // Encrypt
         val encrypted = cipher.doFinal(decrypted)
 
         val encryptedSink = Buffer()
         encryptedSink.write(encrypted)
-        super.write(encryptedSink, encryptedSink.size())
+        super.write(encryptedSink, encryptedSink.size)
     }
 
 }

lib/src/main/java/nl/nl2312/okio/cipher/CipherSource.kt

@@ -5,7 +5,6 @@ import okio.ForwardingSource
 import okio.Source
 import javax.crypto.Cipher
 
-
 /**
  * Accepts an encrypted [Source] and deciphers it on the fly.
  *
@@ -28,8 +27,8 @@ class CipherSource(
         if (bytesToRead < 0) throw IllegalArgumentException("bytesRequested > max allowed")
 
         var streamEnd = false
-        while (sourceBuffer.size() < bytesToRead && !streamEnd) {
-            val bytesRead = super.read(sourceBuffer, bytesToRead - sourceBuffer.size())
+        while (sourceBuffer.size < bytesToRead && !streamEnd) {
+            val bytesRead = super.read(sourceBuffer, bytesToRead - sourceBuffer.size)
             if (bytesRead < 0) {
                 streamEnd = true
             }
@@ -50,7 +49,7 @@ class CipherSource(
         }
 
         // Sink the requested number of bytes (or all that were still in the source)
-        val bytesToReturn = bytesRequested.coerceAtMost(decipheredBuffer.size())
+        val bytesToReturn = bytesRequested.coerceAtMost(decipheredBuffer.size)
         sink.write(decipheredBuffer, bytesToReturn)
 
         // Return number of written deciphered bytes, or -1 if there is nothing more to decipher

lib/src/test/java/nl/nl2312/okio/base64/Base64SourceTest.kt

@@ -2,7 +2,7 @@ package nl.nl2312.okio.base64
 
 import com.google.common.truth.Truth.assertThat
 import okio.Buffer
-import okio.ByteString
+import okio.ByteString.Companion.toByteString
 import org.junit.Test
 import java.util.*
 
@@ -24,7 +24,7 @@ class Base64SourceTest {
         // Generate a very long random string
         val randomLongByteArray =
                 Random().let { random -> (0..10_000).map { (random.nextInt()).toByte() } }.toByteArray()
-        val randomLongBase64 = ByteString.of(randomLongByteArray, 0, randomLongByteArray.size)
+        val randomLongBase64 = randomLongByteArray.toByteString(0, randomLongByteArray.size)
         val randomLongSource = Buffer().also { it.writeUtf8(randomLongBase64.base64()) }
 
         val decoded = Base64Source(randomLongSource)

lib/src/test/java/nl/nl2312/okio/cipher/CipherSinkTest.kt

@@ -9,7 +9,6 @@ import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
-
 class CipherSinkTest {
 
     private val encodeCipher: Cipher

lib/src/test/java/nl/nl2312/okio/cipher/CipherSourceTest.kt

@@ -2,17 +2,15 @@ package nl.nl2312.okio.cipher
 
 import com.google.common.truth.Truth.assertThat
 import nl.nl2312.okio.base64.Base64Source
-import okio.Buffer
-import okio.ByteString
-import okio.Okio
-import okio.Source
+import okio.*
+import okio.ByteString.Companion.encodeUtf8
+import okio.ByteString.Companion.toByteString
 import org.junit.Test
 import java.security.SecureRandom
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 import javax.crypto.spec.SecretKeySpec
 
-
 class CipherSourceTest {
 
     private val encodeCipher: Cipher
@@ -115,7 +113,7 @@ class CipherSourceTest {
 
         // Okio's RealBufferedSource.read(Buffer, Long) will only write to the given buffer when the
         // CipherSource.read(Buffer, Long) returns a non-negative byes read could
-        val buffer = Okio.buffer(decoded as Source)
+        val buffer = (decoded as Source).buffer()
         val output = Buffer()
         buffer.read(output, 8192)
         assertThat(output.readUtf8()).isEqualTo("okio oh my¿¡ okio oh my¿¡ okio oh my¿¡")
@@ -124,7 +122,7 @@ class CipherSourceTest {
     @Test
     fun read_base64Wrapped() {
         val ciphered = encodeCipher.doFinal("okio oh my¿¡".toByteArray())
-        val base64 = ByteString.encodeUtf8(ByteString.of(ciphered, 0, ciphered.size).base64())
+        val base64 = ciphered.toByteString(0, ciphered.size).base64().encodeUtf8()
         val base64Source = Buffer().write(base64)
 
         val decoded = CipherSource(Base64Source(base64Source), decodeCipher)