wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Gradle deprecation warnings (#2879)

Browse source 
Gradle 7 will remove some features and they need to be replaced
This commit is contained in:
Väinö Mäkelä 2020-07-24 09:30:00 +03:00 committed by GitHub
parent d7bac9ed3e
commit 742816b759
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
desktop/build.gradle.kts
View file

@ -49,6 +49,9 @@ tasks.register<JavaExec>("debug") {
tasks.register<Jar>("dist") { // Compiles the jar file tasks.register<Jar>("dist") { // Compiles the jar file
dependsOn(tasks.getByName("classes")) dependsOn(tasks.getByName("classes"))
// META-INF/INDEX.LIST and META-INF/io.netty.versions.properties are duplicated, but I don't know why
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
from(files(sourceSets.main.get().output.resourcesDir)) from(files(sourceSets.main.get().output.resourcesDir))
from(files(sourceSets.main.get().output.classesDirs)) from(files(sourceSets.main.get().output.classesDirs))
// see Laurent1967's comment on https://github.com/libgdx/libgdx/issues/5491 // see Laurent1967's comment on https://github.com/libgdx/libgdx/issues/5491
@ -56,7 +59,7 @@ tasks.register<Jar>("dist") { // Compiles the jar file
from(files(assetsDir)) from(files(assetsDir))
// This is for the .dll and .so files to make the Discord RPC work on all desktops // This is for the .dll and .so files to make the Discord RPC work on all desktops
from(files(discordDir)) from(files(discordDir))
archiveName = "${BuildConfig.appName}.jar" archiveFileName.set("${BuildConfig.appName}.jar")
manifest { manifest {
attributes(mapOf("Main-Class" to mainClassName, "Specification-Version" to BuildConfig.appVersion)) attributes(mapOf("Main-Class" to mainClassName, "Specification-Version" to BuildConfig.appVersion))
@ -105,9 +108,9 @@ for(platform in PackrConfig.Platform.values()) {
} }
tasks.register<Zip>("zip${platformName}") { tasks.register<Zip>("zip${platformName}") {
archiveName = "${BuildConfig.appName}-${platformName}.zip" archiveFileName.set("${BuildConfig.appName}-${platformName}.zip")
from(config.outDir) from(config.outDir)
destinationDir = deployFolder destinationDirectory.set(deployFolder)
} }
finalizedBy("zip${platformName}") finalizedBy("zip${platformName}")
@ -115,9 +118,9 @@ for(platform in PackrConfig.Platform.values()) {
} }
tasks.register<Zip>("zipLinuxFilesForJar") { tasks.register<Zip>("zipLinuxFilesForJar") {
archiveName = "linuxFilesForJar.zip" archiveFileName.set("linuxFilesForJar.zip")
from(file("linuxFilesForJar")) from(file("linuxFilesForJar"))
destinationDir = deployFolder destinationDirectory.set(deployFolder)
} }
tasks.register("packr") { tasks.register("packr") {