diff --git a/vgo/build.gradle.kts b/vgo/build.gradle.kts index 29103a5e..f5d5de40 100644 --- a/vgo/build.gradle.kts +++ b/vgo/build.gradle.kts @@ -15,7 +15,7 @@ val r8: Configuration by configurations.creating dependencies { implementation(project(":vgo-core")) - implementation("com.android.tools:sdk-common:30.2.2") + implementation("com.android.tools:sdk-common:31.5.1") testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.1") testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.3") @@ -57,7 +57,9 @@ tasks { "META-INF/DEPENDENCIES", "META-INF/AL2.0", "META-INF/BCKEY.DSA", + "META-INF/BC2048KE.DSA", "META-INF/BCKEY.SF", + "META-INF/BC2048KE.SF", "**/NOTICE*", "javax/activation/**", "xsd/catalog.xml", diff --git a/vgo/src/main/kotlin/com/jzbrooks/vgo/Application.kt b/vgo/src/main/kotlin/com/jzbrooks/vgo/Application.kt index 1c47b915..493c88e3 100644 --- a/vgo/src/main/kotlin/com/jzbrooks/vgo/Application.kt +++ b/vgo/src/main/kotlin/com/jzbrooks/vgo/Application.kt @@ -65,11 +65,11 @@ class Application { if (inputs.isEmpty()) { require(outputs.isEmpty()) - var path = readLine() + var path = readlnOrNull() val standardInPaths = mutableListOf() while (path != null) { standardInPaths.add(path) - path = readLine() + path = readlnOrNull() } inputs = standardInPaths @@ -150,7 +150,7 @@ class Application { rootNodes.any { it.nodeName == "svg" || input.extension == "svg" } -> { if (outputFormat == "vd") { ByteArrayOutputStream().use { pipeOrigin -> - val errors = Svg2Vector.parseSvgToXml(input, pipeOrigin) + val errors = Svg2Vector.parseSvgToXml(input.toPath(), pipeOrigin) if (errors != "") { System.err.println(errors) // return