From ce3150082d7bc409331190861bc4bd6b8bb8810a Mon Sep 17 00:00:00 2001 From: Gary Tierney Date: Fri, 2 Jun 2017 22:30:39 +0100 Subject: [PATCH] Fix builds on other platforms (non-Unix) --- game/build.gradle | 2 +- .../org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/game/build.gradle b/game/build.gradle index e7db42a3..d421fc93 100644 --- a/game/build.gradle +++ b/game/build.gradle @@ -31,7 +31,7 @@ dependencies { compile group: 'io.github.lukehutch', name: 'fast-classpath-scanner', version: '2.0.21' compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jre8', version: "$kotlinVersion" - compile group: 'org.jetbrains.kotlin', name: 'kotlin-compiler', version: "$kotlinVersion" + compile group: 'org.jetbrains.kotlin', name: 'kotlin-compiler-embeddable', version: "$kotlinVersion" testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion" } diff --git a/game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt b/game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt index ee655af3..85840729 100644 --- a/game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt +++ b/game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt @@ -1,12 +1,11 @@ package org.apollo.game.plugin.kotlin -import com.google.common.base.CaseFormat -import com.intellij.openapi.util.Disposer import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.* import org.jetbrains.kotlin.cli.jvm.compiler.* import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot import org.jetbrains.kotlin.codegen.CompilationException +import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate import java.io.File @@ -15,9 +14,7 @@ import java.net.URISyntaxException import java.net.URLClassLoader import java.nio.file.* import java.nio.file.StandardOpenOption.* -import java.nio.file.attribute.BasicFileAttributes import java.util.* -import java.util.function.BiPredicate class KotlinMessageCollector : MessageCollector { @@ -75,7 +72,7 @@ class KotlinPluginCompiler(val classpath: List, val messageCollector: Mess println("Warning! Boot class path is not supported, must be supplied on the command line") } else { val bootClasspath = runtimeBean.bootClassPath - classpath.addAll(bootClasspath.split(':').map { File(it) }) + classpath.addAll(bootClasspath.split(File.pathSeparatorChar).map { File(it) }) } /**