Reformatted :desktop and :mpqviewer build scripts

Reformatted :desktop and :mpqviewer build scripts
Moved :mpqviewer resources into src/main/resources
Enabled EXCLUDE flag for duplicate dependencies for jar task
Excluded many local assets from :desktop:jar
This commit is contained in:
Collin Smith 2020-11-23 17:01:15 -08:00
parent ff12375815
commit f32356ccfb
44 changed files with 24 additions and 23 deletions

View File

@ -34,12 +34,17 @@ run {
jar {
archiveBaseName = appName
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
// These can be excluded because they add to the jar size but libGDX 1.9.11 can't use them.
// If your libGDX version is 1.9.10 or earlier, or is 1.9.12-SNAPSHOT or later, you can leave
// the following line commented; if you use 1.9.11 exactly, or if you use 1.9.12-SNAPSHOT but
// don't need ARM Linux support, you can uncomment it safely.
// It's always safe to keep that line commented out; it only affects JAR size.
// exclude('linux/arm32/**', 'linux/arm64/**')
exclude('data/global/excel/*.bin') // generated bins
exclude('data/*.ods') // source files for excel tables
exclude('lang/*.txt') // source files for i18n tables
exclude('test/**') // test resources
dependsOn configurations.runtimeClasspath
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
manifest {

View File

@ -5,11 +5,7 @@ import org.gradle.internal.os.OperatingSystem
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
sourceSets.main.resources.srcDirs += [ file('assets').path ]
project.ext {
visuiVersion = '1.4.2'
}
project.ext.visuiVersion = '1.4.2'
dependencies {
implementation project(':core')
@ -25,30 +21,30 @@ application {
}
run {
workingDir = rootProject.file('assets').path
setIgnoreExitValue(true)
// Required to run LWJGL3 java apps on MacOS
if (OperatingSystem.current() == OperatingSystem.MAC_OS) {
jvmArgs += "-XstartOnFirstThread"
}
if (OperatingSystem.current() == OperatingSystem.MAC_OS) {
jvmArgs += "-XstartOnFirstThread"
}
}
jar {
archiveBaseName = project.name
// These can be excluded because they add to the jar size but libGDX 1.9.11 can't use them.
// If your libGDX version is 1.9.10 or earlier, or is 1.9.12-SNAPSHOT or later, you can leave
// the following line commented; if you use 1.9.11 exactly, or if you use 1.9.12-SNAPSHOT but
// don't need ARM Linux support, you can uncomment it safely.
// It's always safe to keep that line commented out; it only affects JAR size.
// exclude('linux/arm32/**', 'linux/arm64/**')
dependsOn configurations.runtimeClasspath
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
manifest {
attributes 'Main-Class': application.mainClass
}
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
// These can be excluded because they add to the jar size but libGDX 1.9.11 can't use them.
// If your libGDX version is 1.9.10 or earlier, or is 1.9.12-SNAPSHOT or later, you can leave
// the following line commented; if you use 1.9.11 exactly, or if you use 1.9.12-SNAPSHOT but
// don't need ARM Linux support, you can uncomment it safely.
// It's always safe to keep that line commented out; it only affects JAR size.
// exclude('linux/arm32/**', 'linux/arm64/**')
dependsOn configurations.runtimeClasspath
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
manifest {
attributes 'Main-Class': application.mainClass
}
doLast {
file(archiveFile).setExecutable(true, false)
}
doLast {
file(archiveFile).setExecutable(true, false)
}
}

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB