s/joptsimple.internal.Strings.join/java.lang.String.join/
Change-Id: Ifa7aae3ec3899232e14e209643d99fd6000948f9
diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationSourceStrings.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationSourceStrings.java
index 019e18c..cf966ee 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationSourceStrings.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationSourceStrings.java
@@ -9,7 +9,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
-import joptsimple.internal.Strings;
public class ProguardConfigurationSourceStrings implements ProguardConfigurationSource {
@@ -40,7 +39,7 @@
@Override
public String get() {
- return Strings.join(config, System.lineSeparator());
+ return String.join(System.lineSeparator(), config);
}
@Override
diff --git a/src/test/java/com/android/tools/r8/TestBase.java b/src/test/java/com/android/tools/r8/TestBase.java
index d30b2e2..024be59 100644
--- a/src/test/java/com/android/tools/r8/TestBase.java
+++ b/src/test/java/com/android/tools/r8/TestBase.java
@@ -28,6 +28,7 @@
import com.android.tools.r8.utils.PreloadedClassFileProvider;
import com.android.tools.r8.utils.ZipUtils;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
import java.io.File;
@@ -47,7 +48,6 @@
import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import joptsimple.internal.Strings;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -364,12 +364,13 @@
*/
public static String keepMainProguardConfiguration(Class clazz, List<String> additionalLines) {
String modifier = (clazz.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC ? "public " : "";
- return Strings.join(ImmutableList.of(
- "-keep " + modifier + "class " + getJavacGeneratedClassName(clazz) + " {",
- " public static void main(java.lang.String[]);",
- "}",
- "-printmapping"
- ), "\n") + (additionalLines.size() > 0 ? ("\n" + Strings.join(additionalLines, "\n")) : "");
+ return String.join(System.lineSeparator(),
+ Iterables.concat(ImmutableList.of(
+ "-keep " + modifier + "class " + getJavacGeneratedClassName(clazz) + " {",
+ " public static void main(java.lang.String[]);",
+ "}",
+ "-printmapping"),
+ additionalLines));
}
/**
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index f63f4f2..07c63aa 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -60,7 +60,6 @@
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
-import joptsimple.internal.Strings;
import org.junit.Assume;
import org.junit.rules.TemporaryFolder;
@@ -267,7 +266,7 @@
}
if (!classpaths.isEmpty()) {
result.add("-cp");
- result.add(Strings.join(classpaths, ":"));
+ result.add(String.join(":", classpaths));
}
if (!bootClassPaths.isEmpty()) {
result.add("-Xbootclasspath:" + String.join(":", bootClassPaths));
diff --git a/src/test/java/com/android/tools/r8/naming/b72391662/B72391662.java b/src/test/java/com/android/tools/r8/naming/b72391662/B72391662.java
index b96c17a..c82bbc9 100644
--- a/src/test/java/com/android/tools/r8/naming/b72391662/B72391662.java
+++ b/src/test/java/com/android/tools/r8/naming/b72391662/B72391662.java
@@ -15,7 +15,6 @@
import com.android.tools.r8.utils.AndroidApp;
import com.google.common.collect.ImmutableList;
import java.util.List;
-import joptsimple.internal.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,7 +40,7 @@
AndroidApp app = readClassesAndAndriodJar(ImmutableList.of(
mainClass, Interface.class, Super.class, TestClass.class,
OtherPackageSuper.class, OtherPackageTestClass.class));
- app = compileWithR8(app, Strings.join(config, System.lineSeparator()));
+ app = compileWithR8(app, String.join(System.lineSeparator(), config));
assertEquals("123451234567\nABC\n", runOnArt(app, mainClass.getCanonicalName()));
}
diff --git a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ProguardCompatabilityTestBase.java b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ProguardCompatabilityTestBase.java
index 9a31c0d..004c31f 100644
--- a/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ProguardCompatabilityTestBase.java
+++ b/src/test/java/com/android/tools/r8/shaking/forceproguardcompatibility/ProguardCompatabilityTestBase.java
@@ -17,7 +17,6 @@
import java.io.File;
import java.nio.file.Path;
import java.util.List;
-import joptsimple.internal.Strings;
public class ProguardCompatabilityTestBase extends TestBase {
@@ -31,7 +30,7 @@
protected DexInspector runShrinker(
Shrinker mode, List<Class> programClasses, List<String> proguadConfigs) throws Exception {
- return runShrinker(mode, programClasses, Strings.join(proguadConfigs, System.lineSeparator()));
+ return runShrinker(mode, programClasses, String.join(System.lineSeparator(), proguadConfigs));
}
protected DexInspector runShrinker(
