Update to Kotlin 1.60 and Gradle 4.9

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
+6 -33
View File
@@ -1,14 +1,5 @@
buildscript {
repositories {
jcenter()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0.RC4-3"
}
plugins {
id "io.gitlab.arturbosch.detekt" version "1.0.0.RC8" apply(false)
}
def detektConfig = "${project.projectDir}/detekt.yml"
@@ -18,33 +9,15 @@ subprojects { subproj ->
apply plugin: 'apollo-plugin'
apply plugin: 'io.gitlab.arturbosch.detekt'
buildscript {
repositories {
jcenter()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0.RC4-3"
}
}
repositories {
mavenCentral()
maven {
url { 'https://dl.bintray.com/kotlin/kotlinx/' }
}
}
detekt {
version = "1.0.0.RC4-3"
profile("main") {
input = "${subproj.projectDir}/src"
config = detektConfig
}
}
dependencies {
implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
}
}
}
@@ -1,12 +1,10 @@
import org.apollo.game.model.Direction
import org.apollo.game.model.Position
import org.apollo.game.plugin.entity.spawn.Spawn
import org.apollo.game.plugin.entity.spawn.Spawns
import org.apollo.game.plugin.skills.fishing.FishingSpot
import org.apollo.game.plugin.skills.fishing.FishingSpot.CAGE_HARPOON
import org.apollo.game.plugin.skills.fishing.FishingSpot.NET_HARPOON
import org.apollo.game.plugin.skills.fishing.FishingSpot.NET_ROD
import org.apollo.game.plugin.skills.fishing.FishingSpot.ROD
import org.apollo.game.plugin.skills.fishing.FishingSpot.*
// Al-Kharid
register(NET_ROD, x = 3267, y = 3148)