Skip to content

Commit 26d492b

Browse files
Getting ready for gradle 9
1 parent 2373cf9 commit 26d492b

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ ext {
2525

2626
group = 'com.github.ie3-institute'
2727
description = 'PowerSystemDataModel'
28-
sourceCompatibility = javaVersion
29-
targetCompatibility = javaVersion
28+
29+
java {
30+
sourceCompatibility = javaVersion
31+
targetCompatibility = javaVersion
32+
}
3033

3134
apply from: scriptsLocation + 'tests.gradle'
3235
apply from: scriptsLocation + 'pmd.gradle'

gradle/scripts/documentation.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
def docBaseDirPath = project.projectDir.toString() + File.separator + project.docsDirName.toString() + File.separator
2-
31
/*
42
* Additional tasks, that are defined by default:
53
* - sphinx -> Generate HTML output of *.rst files in <projectDir>/docs/readthedocs
@@ -12,8 +10,8 @@ sphinx {
1210
description 'Generate high level HTML documentation output.'
1311
group 'Documentation'
1412

15-
sourceDirectory = "${docBaseDirPath}/readthedocs"
16-
outputDirectory = "${project.buildDir}/docs/readthedocs"
13+
sourceDirectory = "${project.projectDir}/docs/readthedocs"
14+
outputDirectory = "${project.rootDir}/build/docs/readthedocs"
1715
}
1816

1917
/**
@@ -54,8 +52,8 @@ task puml2png() {
5452
"build/plantuml.jar",
5553
"-psvg",
5654
"-o",
57-
"${docBaseDirPath}readthedocs/_static/figures/uml/",
58-
"${docBaseDirPath}uml/**/*.puml"
55+
"${project.projectDir}/docs/readthedocs/_static/figures/uml/",
56+
"${project.projectDir}/docs/uml/**/*.puml"
5957
]
6058
}
6159
}

gradle/scripts/jacoco.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jacocoTestReport {
1212
xml.required = true
1313
csv.required = false
1414
html.required = true
15-
html.destination file("${rootDir}/build/reports/jacoco")
15+
html.outputLocation = file("${rootDir}/build/reports/jacoco")
1616
}
1717

1818
// what to exclude from coverage report (files that should not be analyzed!)

0 commit comments

Comments
 (0)