Remove and disable unused modules

This commit is contained in:
crschnick 2023-04-04 16:11:31 +00:00
parent 8117b228ee
commit 0cf07edc2d
12 changed files with 11 additions and 20 deletions

View file

@ -72,8 +72,7 @@ dependencies {
testImplementation project(':core') testImplementation project(':core')
} }
Arrays.stream(file("$rootDir/ext").list()) project.allExtensions.forEach(p -> {
.map(l -> project(":$l")).forEach(p -> {
dependencies { dependencies {
testCompileOnly p testCompileOnly p
} }
@ -117,8 +116,7 @@ test {
} }
def extensionJarDepList = Arrays.stream(file("$rootDir/ext").list()) def extensionJarDepList = project.allExtensions.stream().map(p -> p.getTasksByName('jar', true)).toList();
.map(l -> project(":$l").getTasksByName('jar', true)).toList();
jar { jar {
finalizedBy(extensionJarDepList) finalizedBy(extensionJarDepList)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 KiB

View file

@ -22,6 +22,9 @@ def getArchName() {
project.ext { project.ext {
ci = System.getenv('CI') != null ci = System.getenv('CI') != null
os = org.gradle.internal.os.OperatingSystem.current() os = org.gradle.internal.os.OperatingSystem.current()
allExtensions = Arrays.stream(file("$rootDir/ext").list())
.filter(s -> !s.equals('csv') && !s.equals('office') && !s.equals('pdx') && !s.equals('jackson') && !s.equals('collections'))
.map(l -> project(":$l")).toList()
fullVersion = file("$rootDir/private_files.txt").exists() fullVersion = file("$rootDir/private_files.txt").exists()
arch = getArchName() arch = getArchName()
privateExtensions = file("$rootDir/private_extensions.txt").exists() ? file("$rootDir/private_extensions.txt").readLines() : [] privateExtensions = file("$rootDir/private_extensions.txt").exists() ? file("$rootDir/private_extensions.txt").readLines() : []

View file

@ -1 +0,0 @@
Initial Release!

View file

@ -1 +0,0 @@
Initial Release!

View file

@ -1,2 +0,0 @@
- Improve data store creation on the CLI
- Fix many bugs

View file

@ -1,4 +0,0 @@
- Fix native library loading
- Fix automatic updater
- Fixes for headless systems
- Fix many bugs

View file

@ -1,2 +0,0 @@
- Polish CLI
- Fix many bugs

View file

@ -1 +0,0 @@
Initial Release!

View file

@ -95,8 +95,7 @@ jlink {
tasks.named('jlink').get().dependsOn(rootProject.getTasksByName("jar", true)) tasks.named('jlink').get().dependsOn(rootProject.getTasksByName("jar", true))
def outputName = org.gradle.internal.os.OperatingSystem.current().isMacOsX() ? 'xpiped.app/Contents/Resources' : 'xpiped' def outputName = org.gradle.internal.os.OperatingSystem.current().isMacOsX() ? 'xpiped.app/Contents/Resources' : 'xpiped'
def extModules = Arrays.asList(file("$rootDir/ext").list()).stream() def extModules = project.allExtensions.toList()
.map(l -> project(":$l")).toList()
task copyBundledExtensions(type: DefaultTask, task copyBundledExtensions(type: DefaultTask,
dependsOn: extModules.stream().map { it.getTasksByName('createExtOutput', true)[0] }.toList()) { dependsOn: extModules.stream().map { it.getTasksByName('createExtOutput', true)[0] }.toList()) {
doLast { doLast {

View file

@ -8,9 +8,11 @@ copyRuntimeLibs.dependsOn(addDependenciesModuleInfo)
jar.dependsOn(copyRuntimeLibs) jar.dependsOn(copyRuntimeLibs)
def dev = tasks.register('createDevOutput', Copy) { def dev = tasks.register('createDevOutput', Copy) {
if (project.allExtensions.contains(project)) {
var source = "${project.jar.destinationDirectory.get()}" var source = "${project.jar.destinationDirectory.get()}"
from source from source
into "${project.rootDir}/app/build/ext_dev/$project.name" into "${project.rootDir}/app/build/ext_dev/$project.name"
}
} }
jar.finalizedBy(dev) jar.finalizedBy(dev)