Migrate from Byte Units to byte-size

gradle/libs.versions.toml

@@ -15,7 +15,7 @@ clikt = "com.github.ajalt.clikt:clikt:5.1.0"
 junit = "junit:junit:4.13.2"
 assertk = "com.willowtreeapps.assertk:assertk:0.28.1"
 okio = "com.squareup.okio:okio:3.16.4"
-byteunits = "com.jakewharton.byteunits:byteunits:0.9.1"
+bytesize = "me.saket.bytesize:bytesize:2.1.0"
 asm = "org.ow2.asm:asm:9.9.1"
 diffUtils = "io.github.java-diff-utils:java-diff-utils:4.16"
 picnic = "com.jakewharton.picnic:picnic:0.7.0"

io/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'org.jetbrains.dokka'
 
 dependencies {
   api libs.okio
-  implementation libs.byteunits
+  implementation libs.bytesize
 
   testImplementation libs.junit
   testImplementation libs.assertk

io/src/main/kotlin/com/jakewharton/diffuse/io/Size.kt

@@ -1,15 +1,15 @@
 package com.jakewharton.diffuse.io
 
-import com.jakewharton.byteunits.BinaryByteUnit
 import kotlin.math.absoluteValue
+import me.saket.bytesize.binaryBytes
 
 @JvmInline
 value class Size(val bytes: Long) : Comparable<Size> {
   override fun toString(): String =
     if (bytes >= 0) {
-      BinaryByteUnit.format(bytes)
+      bytes.binaryBytes.toString()
     } else {
-      "-" + BinaryByteUnit.format(-bytes)
+      "-" + (-bytes).binaryBytes.toString()
     }
 
   override fun compareTo(other: Size) = bytes.compareTo(other.bytes)

io/src/test/kotlin/com/jakewharton/diffuse/io/SizeTest.kt

@@ -0,0 +1,20 @@
+package com.jakewharton.diffuse.io
+
+import assertk.assertThat
+import assertk.assertions.hasToString
+import org.junit.Test
+
+class SizeTest {
+  @Test
+  fun toStringFormatsBytes() {
+    assertThat(Size(0)).hasToString("0 B")
+    assertThat(Size(1)).hasToString("1 B")
+    assertThat(Size(-1)).hasToString("-1 B")
+    assertThat(Size(1024)).hasToString("1 KiB")
+    assertThat(Size(-1024)).hasToString("-1 KiB")
+    assertThat(Size(1024L * 1024)).hasToString("1 MiB")
+    assertThat(Size(-(1024L * 1024))).hasToString("-1 MiB")
+    assertThat(Size(1024L * 1024 * 1024)).hasToString("1 GiB")
+    assertThat(Size(-(1024L * 1024 * 1024))).hasToString("-1 GiB")
+  }
+}