Skip to content

Commit 492301c

Browse files
committed
chore(gradle): update buildscript
1 parent aaae74e commit 492301c

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

gradle/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ plugins {
1010
id("org.jetbrains.dokka") version "0.10.1"
1111
id("scripts-task")
1212

13-
id("com.github.ben-manes.versions") version "0.36.0"
13+
id("com.github.ben-manes.versions") version "0.38.0"
1414
id("se.patrikerdes.use-latest-versions") version "0.2.15"
1515
}
1616

1717
val gameName by extra { property("socha.gameName") as String }
1818
val versions = arrayOf("year", "minor", "patch").map { property("socha.version.$it").toString().toInt() }
1919
val versionObject = KotlinVersion(versions[0], versions[1], versions[2])
20-
version = versions.joinToString(".") { it.toString() }
20+
version = versionObject.toString()
2121
val year by extra { "20${versionObject.major}" }
2222
val game by extra { "${gameName}_$year" }
2323

@@ -283,7 +283,9 @@ allprojects {
283283
archiveClassifier.set("sources")
284284
from(sourceSets.main.get().allSource)
285285
}
286-
install.get().dependsOn(docJar, sourcesJar)
286+
install {
287+
dependsOn(docJar, sourcesJar)
288+
}
287289
artifacts {
288290
archives(sourcesJar.archiveFile) { classifier = "sources" }
289291
archives(docJar.archiveFile) { classifier = "javadoc" }
@@ -300,7 +302,7 @@ allprojects {
300302
}
301303
withType<Jar> {
302304
if (plugins.hasPlugin(ApplicationPlugin::class))
303-
manifest.attributes["Main-Class"] = project.extensions.getByType<JavaApplication>().mainClassName
305+
manifest.attributes["Main-Class"] = project.extensions.getByType<JavaApplication>().mainClass.get()
304306
}
305307
}
306308
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)