diff --git a/build.gradle b/build.gradle index 6ec193775..8c902ff6d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.5.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.42.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.152.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.1.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3' classpath 'com.palantir.javaformat:gradle-palantir-java-format:1.1.0' diff --git a/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java b/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java index 415a084a4..c593268be 100644 --- a/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java +++ b/human-readable-types/src/main/java/com/palantir/humanreadabletypes/HumanReadableByteCount.java @@ -302,10 +302,10 @@ public String toString() { public enum ByteUnit { BYTE(1, "bytes"), KiB(1024L, "kibibytes"), - MiB((long) Math.pow(1024L, 2L), "mebibytes"), - GiB((long) Math.pow(1024L, 3L), "gibibytes"), - TiB((long) Math.pow(1024L, 4L), "tebibytes"), - PiB((long) Math.pow(1024L, 5L), "pebibytes"); + MiB((long) Math.pow((double) 1024L, (double) 2L), "mebibytes"), + GiB((long) Math.pow((double) 1024L, (double) 3L), "gibibytes"), + TiB((long) Math.pow((double) 1024L, (double) 4L), "tebibytes"), + PiB((long) Math.pow((double) 1024L, (double) 5L), "pebibytes"); private final long multiplier; private final String suffix; diff --git a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java index d8d100fdc..8d5c2d2a7 100644 --- a/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java +++ b/human-readable-types/src/test/java/com/palantir/humanreadabletypes/HumanReadableByteCountTests.java @@ -44,27 +44,32 @@ public void testParseKibiBytes() { @Test public void testParseMibiBytes() { - assertStringsEqualToBytes((long) Math.pow(1024L, 2L) * 10L, "10m", "10mb", "10 mibibyte", "10 mibibytes"); + assertStringsEqualToBytes( + (long) Math.pow((double) 1024L, (double) 2L) * 10L, "10m", "10mb", "10 mibibyte", "10 mibibytes"); } @Test public void testParseMebiBytes() { - assertStringsEqualToBytes((long) Math.pow(1024L, 2L) * 10L, "10m", "10mb", "10 mebibyte", "10 mebibytes"); + assertStringsEqualToBytes( + (long) Math.pow((double) 1024L, (double) 2L) * 10L, "10m", "10mb", "10 mebibyte", "10 mebibytes"); } @Test public void testParseGibiBytes() { - assertStringsEqualToBytes((long) Math.pow(1024L, 3L) * 10L, "10g", "10gb", "10 gibibyte", "10 gibibytes"); + assertStringsEqualToBytes( + (long) Math.pow((double) 1024L, (double) 3L) * 10L, "10g", "10gb", "10 gibibyte", "10 gibibytes"); } @Test public void testParseTebiBytes() { - assertStringsEqualToBytes((long) Math.pow(1024L, 4L) * 10L, "10t", "10tb", "10 tebibyte", "10 tebibytes"); + assertStringsEqualToBytes( + (long) Math.pow((double) 1024L, (double) 4L) * 10L, "10t", "10tb", "10 tebibyte", "10 tebibytes"); } @Test public void testParsePebiBytes() { - assertStringsEqualToBytes((long) Math.pow(1024L, 5L) * 10L, "10p", "10pb", "10 pebibyte", "10 pebibytes"); + assertStringsEqualToBytes( + (long) Math.pow((double) 1024L, (double) 5L) * 10L, "10p", "10pb", "10 pebibyte", "10 pebibytes"); } @Test