Skip to content

Commit 2963616

Browse files
Merge pull request #892 from ie3-institute/df/#891_gradle8x
Update to gradle 8.x
2 parents e9cd2b0 + 4e177ce commit 2963616

File tree

8 files changed

+198
-150
lines changed

8 files changed

+198
-150
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212

1313
### Changed
1414
- `SqlIdCoordinateSource.createCooridinateValue` now throws an exception when the coordinate can not be built [#911](https://github.com/ie3-institute/PowerSystemDataModel/issues/911)
15+
- CleanUp `BufferedCsvWriterTest` only after all tests are completed [#809](https://github.com/ie3-institute/PowerSystemDataModel/issues/809)
16+
- Update gradle to version 8.4 [#891](https://github.com/ie3-institute/PowerSystemDataModel/issues/891)
1517

1618
## [4.0.0] - 2023-08-01
1719

@@ -32,8 +34,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3234
- Use nio paths instead of strings for file path [#723](https://github.com/ie3-institute/PowerSystemDataModel/issues/723)
3335
- Data source will throw an exceptions instead of returning an empty optionals [#707](https://github.com/ie3-institute/PowerSystemDataModel/issues/707)
3436
- Improving `ValidationUtils` [#758](https://github.com/ie3-institute/PowerSystemDataModel/issues/758)
35-
- CleanUp `BufferedCsvWriterTest` only after all tests are completed [#809](https://github.com/ie3-institute/PowerSystemDataModel/issues/809)
36-
3737

3838
## [3.0.0] - 2023-02-16
3939

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'maven-publish'
55
id 'signing'
66
id 'pmd' // code check, working on source code
7-
id 'com.diffplug.spotless' version '6.22.0'//code format
7+
id 'com.diffplug.spotless' version '6.22.0' //code format
88
id 'com.github.spotbugs' version '5.2.1' // code check, working on byte code
99
id 'de.undercouch.download' version '5.5.0'
1010
id 'kr.motd.sphinx' version '2.10.1' // documentation generation

gradle/scripts/jacoco.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
// general configuration
55
jacoco {
6-
toolVersion = "0.8.7"
7-
reportsDir = file("$buildDir/reports/jacoco")
6+
toolVersion = "0.8.10"
7+
reportsDirectory = layout.projectDirectory.dir("$rootDir/build/reports/jacoco")
88
}
99

1010
jacocoTestReport {
1111
reports {
12-
xml.enabled true
13-
csv.enabled false
14-
html.enabled true
15-
html.destination file("${buildDir}/reports/jacoco")
12+
xml.required = true
13+
csv.required = false
14+
html.required = true
15+
html.destination file("${rootDir}/build/reports/jacoco")
1616
}
1717

1818
// what to exclude from coverage report (files that should not be analyzed!)
@@ -28,7 +28,7 @@ jacocoTestReport {
2828
]
2929

3030
getClassDirectories().setFrom(fileTree(
31-
dir: "$buildDir/classes/",
31+
dir: "$rootDir/build/classes/",
3232
excludes: excludes
3333
))
3434

gradle/scripts/mavenCentralPublish.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Maven publish - start */
22
task sourcesJar(type: Jar) {
3-
classifier "sources"
3+
archiveClassifier.set("sources")
44
from sourceSets.main.allJava
55
}
66

77
task javadocJar(type: Jar, dependsOn: javadoc) {
8-
classifier "javadoc"
8+
archiveClassifier.set("javadoc")
99
from javadoc.destinationDir
1010
}
1111

@@ -91,7 +91,7 @@ if (project.hasProperty('user') && project.hasProperty('password') && project.ha
9191

9292
model {
9393
tasks.generatePomFileForMavenJavaPublication {
94-
destination = file("$buildDir/generated-pom.xml")
94+
destination = file("$rootDir/generated-pom.xml")
9595
}
9696
}
9797
}

gradle/wrapper/gradle-wrapper.jar

5.82 KB
Binary file not shown.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 02 10:39:11 CET 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
networkTimeout=10000
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)