Skip to content
This repository was archived by the owner on Sep 26, 2020. It is now read-only.

Commit 789390e

Browse files
authored
Cleanup (#160)
* Reorganize * Remove unused code * Spotless * Exclude ui-javafx project from coverage
1 parent 837e874 commit 789390e

36 files changed

+942
-1659
lines changed

axon.gradle.kts

+7-4
Original file line numberDiff line numberDiff line change
@@ -406,13 +406,16 @@ configure(kotlinProjects) {
406406

407407
val jacocoRootReport by tasks.creating(JacocoReport::class) {
408408
group = "verification"
409-
dependsOn(subprojects.flatMap { it.tasks.withType(JacocoReport::class) } - this)
409+
val excludedProjects = listOf(uiJavaFxProject)
410+
val includedProjects = subprojects.filter { it !in excludedProjects }
410411

411-
val allSrcDirs = subprojects.map { it.sourceSets.main.get().allSource.srcDirs }
412+
dependsOn(includedProjects.flatMap { it.tasks.withType(JacocoReport::class) } - this)
413+
414+
val allSrcDirs = includedProjects.map { it.sourceSets.main.get().allSource.srcDirs }
412415
additionalSourceDirs.setFrom(allSrcDirs)
413416
sourceDirectories.setFrom(allSrcDirs)
414-
classDirectories.setFrom(subprojects.map { it.sourceSets.main.get().output })
415-
executionData.setFrom(subprojects.filter {
417+
classDirectories.setFrom(includedProjects.map { it.sourceSets.main.get().output })
418+
executionData.setFrom(includedProjects.filter {
416419
File("${it.buildDir}/jacoco/test.exec").exists()
417420
}.flatMap { it.tasks.withType(JacocoReport::class).map { it.executionData } })
418421

ui-javafx/src/main/kotlin/edu/wpi/axon/ui/DatasetCell.kt

-16
This file was deleted.

ui-javafx/src/main/kotlin/edu/wpi/axon/ui/ExampleModelCell.kt

-16
This file was deleted.

0 commit comments

Comments
 (0)