octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-23 05:22:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #897 from soloturn/gradle

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build.gradle.kts
View File

@ -28,14 +28,7 @@ java {
sourceSets { sourceSets {
main { main {
java { java {
srcDirs("src/ext") srcDirs("src")
srcDirs("src/gen")
srcDirs("src/h")
srcDirs("src/jcckit")
srcDirs("src/net")
srcDirs("src/org")
srcDirs("src/smetana")
srcDirs("src/sprites")
} }
resources { resources {
srcDirs("src") srcDirs("src")
@ -47,8 +40,7 @@ sourceSets {
} }
test { test {
java { java {
srcDirs("test/net") srcDirs("test")
srcDirs("test/nonreg")
} }
resources { resources {
srcDirs(".") srcDirs(".")
@ -71,8 +63,9 @@ tasks.withType<Jar> {
configurations.runtimeClasspath.get().filter { it.name.endsWith("jar") }.map { zipTree(it) } 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("skin") { into("skin") }
from("sprites/archimate") { into("sprites/archimate") }
from("stdlib") { into("stdlib") } from("stdlib") { into("stdlib") }
from("svg") { into("svg") } from("svg") { into("svg") }
from("themes") { into("themes") } from("themes") { into("themes") }

5
src/net/sourceforge/plantuml/emoji/data/.editorconfig
View File

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

5
src/net/sourceforge/plantuml/openiconic/data/.editorconfig
View File

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