diff --git a/build.gradle b/build.gradle index 6569369..ca8a656 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id "org.jetbrains.kotlin.jvm" version "1.5.10" + id "org.jetbrains.kotlin.jvm" version "1.6.10" id "java" id "idea" id "eclipse" diff --git a/src/loom010/kotlin/dev/architectury/plugin/loom/LoomInterface010.kt b/src/loom010/kotlin/dev/architectury/plugin/loom/LoomInterface010.kt index 134f1b3..be7b896 100644 --- a/src/loom010/kotlin/dev/architectury/plugin/loom/LoomInterface010.kt +++ b/src/loom010/kotlin/dev/architectury/plugin/loom/LoomInterface010.kt @@ -57,5 +57,7 @@ class LoomInterface010(private val project: Project) : LoomInterface { override fun addVmArg(vmArg: String) { config.vmArgs.add(vmArg) } + + override fun escape(arg: String): String = arg } } \ No newline at end of file diff --git a/src/loom011/kotlin/dev/architectury/plugin/loom/LoomInterface011.kt b/src/loom011/kotlin/dev/architectury/plugin/loom/LoomInterface011.kt index 6f373ac..6f8b7e6 100644 --- a/src/loom011/kotlin/dev/architectury/plugin/loom/LoomInterface011.kt +++ b/src/loom011/kotlin/dev/architectury/plugin/loom/LoomInterface011.kt @@ -78,5 +78,7 @@ class LoomInterface011(private val project: Project) : LoomInterface { override fun addVmArg(vmArg: String) { config.vmArgs.add(vmArg) } + + override fun escape(arg: String): String = arg } } \ No newline at end of file diff --git a/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt b/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt index 474487a..4dfffa3 100644 --- a/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt +++ b/src/main/kotlin/dev/architectury/plugin/ArchitecturyPluginExtension.kt @@ -182,6 +182,7 @@ open class ArchitectPluginExtension(val project: Project) { } loom.settingsPostEdit { config -> + fun String.escapeSpaces(): String = config.escape(this) val s = config.mainClass config.mainClass = "dev.architectury.transformer.TransformerRuntime" mainClassTransformerFile.writeText(s) @@ -206,13 +207,6 @@ open class ArchitectPluginExtension(val project: Project) { } } - private fun String.escapeSpaces(): String { - if (any(Char::isWhitespace)) { - return "\"$this\"" - } - return this - } - @JvmOverloads fun fabric(action: Action = Action {}) { loader(ModLoader.FABRIC, action) diff --git a/src/main/kotlin/dev/architectury/plugin/loom/LoomInterface.kt b/src/main/kotlin/dev/architectury/plugin/loom/LoomInterface.kt index e2d2dd4..293a2ec 100644 --- a/src/main/kotlin/dev/architectury/plugin/loom/LoomInterface.kt +++ b/src/main/kotlin/dev/architectury/plugin/loom/LoomInterface.kt @@ -64,5 +64,10 @@ interface LoomInterface { var mainClass: String fun addVmArg(vmArg: String) + + fun escape(arg: String): String { + if (arg.any(Char::isWhitespace)) return "\"$arg\"" + return arg + } } } \ No newline at end of file