diff --git a/app/build.gradle b/app/build.gradle index ed3fc1334..4c21ed22e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,8 +72,7 @@ dependencies { testImplementation project(':core') } -Arrays.stream(file("$rootDir/ext").list()) - .map(l -> project(":$l")).forEach(p -> { +project.allExtensions.forEach(p -> { dependencies { testCompileOnly p } @@ -117,8 +116,7 @@ test { } -def extensionJarDepList = Arrays.stream(file("$rootDir/ext").list()) - .map(l -> project(":$l").getTasksByName('jar', true)).toList(); +def extensionJarDepList = project.allExtensions.stream().map(p -> p.getTasksByName('jar', true)).toList(); jar { finalizedBy(extensionJarDepList) diff --git a/app/src/main/resources/io/xpipe/app/resources/img/error.png b/app/src/main/resources/io/xpipe/app/resources/img/error.png deleted file mode 100644 index 28b69afa3..000000000 Binary files a/app/src/main/resources/io/xpipe/app/resources/img/error.png and /dev/null differ diff --git a/app/src/main/resources/io/xpipe/app/resources/img/loading.gif b/app/src/main/resources/io/xpipe/app/resources/img/loading.gif deleted file mode 100644 index 416c511b4..000000000 Binary files a/app/src/main/resources/io/xpipe/app/resources/img/loading.gif and /dev/null differ diff --git a/build.gradle b/build.gradle index 26e915842..8fed96e5a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,6 +22,9 @@ def getArchName() { project.ext { ci = System.getenv('CI') != null 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() arch = getArchName() privateExtensions = file("$rootDir/private_extensions.txt").exists() ? file("$rootDir/private_extensions.txt").readLines() : [] diff --git a/dist/changelogs/0.0.1.1.txt b/dist/changelogs/0.0.1.1.txt deleted file mode 100644 index 6d6fa499e..000000000 --- a/dist/changelogs/0.0.1.1.txt +++ /dev/null @@ -1 +0,0 @@ -Initial Release! \ No newline at end of file diff --git a/dist/changelogs/0.0.1.2.txt b/dist/changelogs/0.0.1.2.txt deleted file mode 100644 index 6d6fa499e..000000000 --- a/dist/changelogs/0.0.1.2.txt +++ /dev/null @@ -1 +0,0 @@ -Initial Release! \ No newline at end of file diff --git a/dist/changelogs/0.0.1.3.txt b/dist/changelogs/0.0.1.3.txt deleted file mode 100644 index 4b7ca9683..000000000 --- a/dist/changelogs/0.0.1.3.txt +++ /dev/null @@ -1,2 +0,0 @@ -- Improve data store creation on the CLI -- Fix many bugs \ No newline at end of file diff --git a/dist/changelogs/0.0.1.4.txt b/dist/changelogs/0.0.1.4.txt deleted file mode 100644 index e742ca898..000000000 --- a/dist/changelogs/0.0.1.4.txt +++ /dev/null @@ -1,4 +0,0 @@ -- Fix native library loading -- Fix automatic updater -- Fixes for headless systems -- Fix many bugs \ No newline at end of file diff --git a/dist/changelogs/0.0.1.5.txt b/dist/changelogs/0.0.1.5.txt deleted file mode 100644 index e639b0ab1..000000000 --- a/dist/changelogs/0.0.1.5.txt +++ /dev/null @@ -1,2 +0,0 @@ -- Polish CLI -- Fix many bugs \ No newline at end of file diff --git a/dist/changelogs/0.0.1.txt b/dist/changelogs/0.0.1.txt deleted file mode 100644 index 6d6fa499e..000000000 --- a/dist/changelogs/0.0.1.txt +++ /dev/null @@ -1 +0,0 @@ -Initial Release! \ No newline at end of file diff --git a/dist/jpackage.gradle b/dist/jpackage.gradle index 24de511b2..886d28d26 100644 --- a/dist/jpackage.gradle +++ b/dist/jpackage.gradle @@ -95,8 +95,7 @@ jlink { tasks.named('jlink').get().dependsOn(rootProject.getTasksByName("jar", true)) def outputName = org.gradle.internal.os.OperatingSystem.current().isMacOsX() ? 'xpiped.app/Contents/Resources' : 'xpiped' -def extModules = Arrays.asList(file("$rootDir/ext").list()).stream() - .map(l -> project(":$l")).toList() +def extModules = project.allExtensions.toList() task copyBundledExtensions(type: DefaultTask, dependsOn: extModules.stream().map { it.getTasksByName('createExtOutput', true)[0] }.toList()) { doLast { diff --git a/gradle/gradle_scripts/extension.gradle b/gradle/gradle_scripts/extension.gradle index 4847e5894..17bf5ada6 100644 --- a/gradle/gradle_scripts/extension.gradle +++ b/gradle/gradle_scripts/extension.gradle @@ -8,9 +8,11 @@ copyRuntimeLibs.dependsOn(addDependenciesModuleInfo) jar.dependsOn(copyRuntimeLibs) def dev = tasks.register('createDevOutput', Copy) { - var source = "${project.jar.destinationDirectory.get()}" - from source - into "${project.rootDir}/app/build/ext_dev/$project.name" + if (project.allExtensions.contains(project)) { + var source = "${project.jar.destinationDirectory.get()}" + from source + into "${project.rootDir}/app/build/ext_dev/$project.name" + } } jar.finalizedBy(dev)