2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-06 16:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix builds on other platforms (non-Unix)

Browse Source
This commit is contained in:
Gary Tierney
2017-06-02 22:30:39 +01:00
parent 35ab034f3d
commit ce3150082d
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/build.gradle
+1 -1
View File
@@ -31,7 +31,7 @@ dependencies {
compile group: 'io.github.lukehutch', name: 'fast-classpath-scanner', version: '2.0.21' 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-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" testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
} }
game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt
+2 -5
View File
@@ -1,12 +1,11 @@
package org.apollo.game.plugin.kotlin 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.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.* import org.jetbrains.kotlin.cli.common.messages.*
import org.jetbrains.kotlin.cli.jvm.compiler.* import org.jetbrains.kotlin.cli.jvm.compiler.*
import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
import org.jetbrains.kotlin.codegen.CompilationException import org.jetbrains.kotlin.codegen.CompilationException
import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer
import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate
import java.io.File import java.io.File
@@ -15,9 +14,7 @@ import java.net.URISyntaxException
import java.net.URLClassLoader import java.net.URLClassLoader
import java.nio.file.* import java.nio.file.*
import java.nio.file.StandardOpenOption.* import java.nio.file.StandardOpenOption.*
import java.nio.file.attribute.BasicFileAttributes
import java.util.* import java.util.*
import java.util.function.BiPredicate
class KotlinMessageCollector : MessageCollector { class KotlinMessageCollector : MessageCollector {
@@ -75,7 +72,7 @@ class KotlinPluginCompiler(val classpath: List<File>, val messageCollector: Mess
println("Warning! Boot class path is not supported, must be supplied on the command line") println("Warning! Boot class path is not supported, must be supplied on the command line")
} else { } else {
val bootClasspath = runtimeBean.bootClassPath val bootClasspath = runtimeBean.bootClassPath
classpath.addAll(bootClasspath.split(':').map { File(it) }) classpath.addAll(bootClasspath.split(File.pathSeparatorChar).map { File(it) })
} }
/** /**