1
0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-22 13:05:09 +00:00

Merge pull request #897 from soloturn/gradle

simplify gradle structure, make intellij global reformat stop for SVG
This commit is contained in:
PlantUML 2022-02-04 00:12:27 +01:00 committed by GitHub
commit 39b5adaf65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 13 deletions

View File

@ -28,14 +28,7 @@ java {
sourceSets {
main {
java {
srcDirs("src/ext")
srcDirs("src/gen")
srcDirs("src/h")
srcDirs("src/jcckit")
srcDirs("src/net")
srcDirs("src/org")
srcDirs("src/smetana")
srcDirs("src/sprites")
srcDirs("src")
}
resources {
srcDirs("src")
@ -47,8 +40,7 @@ sourceSets {
}
test {
java {
srcDirs("test/net")
srcDirs("test/nonreg")
srcDirs("test")
}
resources {
srcDirs(".")
@ -71,8 +63,9 @@ tasks.withType<Jar> {
configurations.runtimeClasspath.get().filter { it.name.endsWith("jar") }.map { zipTree(it) }
})
// source sets for java and resources are on "src", only put once into the jar
duplicatesStrategy = org.gradle.api.file.DuplicatesStrategy.EXCLUDE
from("skin") { into("skin") }
from("sprites/archimate") { into("sprites/archimate") }
from("stdlib") { into("stdlib") }
from("svg") { into("svg") }
from("themes") { into("themes") }

View File

@ -1,3 +1,6 @@
# Editor configuration, see http://editorconfig.org
root = true
# no reformat
[*]
# no reformat with intellij
ij_formatter_enabled = false

View File

@ -1,3 +1,6 @@
# Editor configuration, see http://editorconfig.org
root = true
# no reformat
[*]
# no reformat with intellij
ij_formatter_enabled = false