Skip to content

Commit c6169ba

Browse files
author
Xerus
committed
Update buildscript and dependencies
1 parent 2b515bc commit c6169ba

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

gradle/build.gradle.kts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import java.io.InputStream
55
plugins {
66
maven
77
`java-library`
8-
kotlin("jvm") version "1.2.61"
9-
id("com.github.ben-manes.versions") version "0.19.0"
8+
kotlin("jvm") version "1.3.0"
9+
id("com.github.ben-manes.versions") version "0.20.0"
1010
id("org.jetbrains.dokka") version "0.9.17"
1111
}
1212

@@ -61,7 +61,7 @@ tasks {
6161
exec { commandLine("git", "add", "gradle.properties") }
6262
exec { commandLine("git", "commit", "-m", version) }
6363
exec { commandLine("git", "tag", version, "-m", desc) }
64-
exec { commandLine("git", "push", "--tags") }
64+
exec { commandLine("git", "push", "--follow-tags") }
6565
println("""
6666
===================================================
6767
Fertig! Jetzt noch folgende Schritte ausfuehren:
@@ -130,17 +130,18 @@ tasks {
130130
moduleName = "Software-Challenge API $version"
131131
val sourceSets = arrayOf("sdk", "plugin").map { project(it).sourceSets.getByName("main") }
132132
sourceDirs = files(sourceSets.map { it.java.sourceDirectories })
133-
classpath = files(sourceSets.map { it.runtimeClasspath })
134133
outputDirectory = deployDir.resolve("doc").toString()
135134
outputFormat = "javadoc"
136135
jdkVersion = 8
136+
doFirst {
137+
classpath = files(sourceSets.map { it.runtimeClasspath }.flatMap { it.files }.filter { it.exists() })
138+
}
137139
}
138140
"test" {
139141
dependsOn("run")
140142
group = mainGroup
141143
}
142144
"build" {
143-
dependsOn("deploy")
144145
group = mainGroup
145146
}
146147
replace("run").dependsOn("testDeployed")
@@ -162,6 +163,9 @@ allprojects {
162163
outputDirectory = buildDir.resolve("doc").toString()
163164
outputFormat = "javadoc"
164165
jdkVersion = 8
166+
doFirst {
167+
classpath = files(sourceSets.getByName("main").runtimeClasspath.files.filter { it.exists() })
168+
}
165169
}
166170
val sourcesJar by creating(Jar::class) {
167171
baseName = tasks.getByName<Jar>("jar").baseName
@@ -203,9 +207,9 @@ project("sdk") {
203207

204208
dependencies {
205209
api(kotlin("stdlib"))
206-
api("com.thoughtworks.xstream", "xstream", "1.4.10")
210+
api("com.thoughtworks.xstream", "xstream", "1.4.11.1")
207211
api("jargs", "jargs", "1.0")
208-
api("ch.qos.logback", "logback-classic", "0.9.15")
212+
api("ch.qos.logback", "logback-classic", "1.2.3")
209213

210214
implementation("org.hamcrest", "hamcrest-core", "1.3")
211215
implementation("net.sf.kxml", "kxml2", "2.3.0")

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

player/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
33

44
plugins {
55
application
6-
id("com.github.johnrengelman.shadow") version "2.0.4"
6+
id("com.github.johnrengelman.shadow") version "4.0.2"
77
}
88

99
val game = property("game").toString()

plugin/src/shared/sc/plugin2019/GameState.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ class GameState(
4545
* Liefert Statusinformationen zu einem Spieler als Array mit folgenden
4646
* Einträgen:
4747
*
48-
* * [0] - Punktekonto des Spielers (Größe des Schwarms)
48+
* * `[0]` - Punktekonto des Spielers (Größe des Schwarms)
4949
*
5050
*/
5151
fun getPlayerStats(playerColor: PlayerColor): IntArray =
5252
getGameStats()[if (playerColor == PlayerColor.RED) Constants.GAME_STATS_RED_INDEX else Constants.GAME_STATS_BLUE_INDEX]
5353

5454
/**
5555
* Liefert Statusinformationen zum Spiel. Diese sind ein Array der
56-
* [Spielerstats][getPlayerStats], wobei getGameStats()[0],
57-
* einem Aufruf von getPlayerStats(PlayerColor.RED) entspricht.
56+
* [getPlayerStats], wobei `getGameStats()[0]`,
57+
* einem Aufruf von `getPlayerStats(PlayerColor.RED)` entspricht.
5858
*
5959
* @return Statusinformationen beider Spieler
6060
*

0 commit comments

Comments
 (0)