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

Update to Kotlin 1.60 and Gradle 4.9

Browse Source 
Removes the dependency on legacy script compilation and now relies on script
discovery.  In addition, the Gradle build scripts were refactored and updated
to be compatible with Gradle 5.0 and make use of the new java-library
configurations.
This commit is contained in:
Gary Tierney
2018-08-19 19:26:51 +01:00
parent 7fee8277ab
commit 0651d535fa
20 changed files with 171 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/build.gradle
+18 -34
View File
@@ -1,44 +1,28 @@
plugins {
id 'application'
id 'org.jetbrains.kotlin.jvm'
id 'org.jetbrains.kotlin.plugin.scripting'
}
description = 'Apollo Game'
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath group: 'org.jetbrains.kotlin', name: 'kotlin-gradle-plugin', version: "$kotlinVersion"
}
}
apply plugin: 'kotlin'
allprojects {
it.plugins.withId('kotlin') {
kotlin { experimental { coroutines 'enable' } }
}
}
mainClassName = 'org.apollo.Server'
dependencies {
compile project(':cache')
compile project(':net')
compile project(':util')
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-script-runtime', version: "$kotlinVersion"
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: '0.16'
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '0.16'
compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
compile group: 'org.jetbrains.kotlin', name: 'kotlin-scripting-common'
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: kotlinxCoroutinesVersion
compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: kotlinxCoroutinesVersion
project(":game:plugin").subprojects.each { plugin ->
runtime plugin
}
implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
implementation group: 'io.github.lukehutch', name: 'fast-classpath-scanner', version: classpathScannerVersion
implementation group: 'com.lambdaworks', name: 'scrypt', version: scryptVersion
testCompile group: 'org.assertj', name: 'assertj-core', version: '3.8.0'
testImplementation group: 'junit', name: 'junit', version: junitVersion
testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: powermockVersion
testImplementation group: 'org.powermock', name: 'powermock-api-mockito', version: powermockVersion
testImplementation group: 'org.assertj', name: 'assertj-core', version: assertjVersion
}
task run(type: JavaExec, dependsOn: classes) {
main = 'org.apollo.Server'
classpath = sourceSets.main.runtimeClasspath
jvmArgs = ['-Xmx1750M']
workingDir = "$rootDir"
}