Fixed a bug with the build

This commit is contained in:
saval559362 2020-12-30 12:46:56 +03:00
parent 2960ea0b23
commit 2ccba64687

View File

@ -80,30 +80,6 @@ dependencies {
// LWJGL END // LWJGL END
jar {
manifest {
attributes(
"Main-Class": "ru.windcorp.progressia.client.ProgressiaClientMain",
"Class-Path": configurations.runtimeClasspath.collect { "lib/" + it.getName() }.join(' ')
)
}
}
/*
* Copies runtime dependencies to a prespecified location so they can be packaged properly.
*/
task copyLibs(type: Copy) {
into "${libsDir}/lib"
from configurations.runtimeClasspath
}
build.dependsOn(copyLibs)
configurations { configurations {
packageOnly packageOnly
packageLibraries.extendsFrom runtimeClasspath packageLibraries.extendsFrom runtimeClasspath
@ -129,6 +105,25 @@ dependencies {
packageOnly "org.lwjgl:lwjgl-vulkan::natives-macos" packageOnly "org.lwjgl:lwjgl-vulkan::natives-macos"
} }
jar {
manifest {
attributes(
"Main-Class": "ru.windcorp.progressia.client.ProgressiaClientMain",
"Class-Path": configurations.packageLibraries.collect { "lib/" + it.getName() }.join(' ')
)
}
}
/*
* Copies runtime dependencies to a prespecified location so they can be packaged properly.
*/
task copyLibs(type: Copy) {
into "${libsDir}/lib"
from configurations.runtimeClasspath
}
build.dependsOn(copyLibs)
task copyLibsForPackaging(type: Copy) { task copyLibsForPackaging(type: Copy) {
into "${libsDir}/lib" into "${libsDir}/lib"
from configurations.packageLibraries from configurations.packageLibraries
@ -139,8 +134,13 @@ task createPackages(type: Exec) {
} }
java { java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
} }
createPackages.dependsOn(copyLibsForPackaging) compileJava {
options.compilerArgs.addAll(['--release', '8'])
}
createPackages.dependsOn(build)
createPackages.dependsOn(copyLibsForPackaging)