Skip to content

Commit a6ea96c

Browse files
authoredMar 12, 2025··
Merge branch 'dev' into ps/#545-GitHubActions
2 parents 48575dc + a162c49 commit a6ea96c

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed
 

‎build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'scala'
55
id 'pmd' // code check, working on source code
66
id 'com.diffplug.spotless' version '6.25.0'//code format
7-
id 'com.github.spotbugs' version '6.1.5' // code check, working on byte code
7+
id 'com.github.spotbugs' version '6.1.7' // code check, working on byte code
88
id 'de.undercouch.download' version '5.6.0'
99
id 'kr.motd.sphinx' version '2.10.1' // documentation generation
1010
id "com.github.maiflai.scalatest" version "0.33" // run scalatest without specific spec task
@@ -21,7 +21,7 @@ ext {
2121
pekkoVersion = '1.1.3'
2222

2323
tscfgVersion = '0.9.995'
24-
scapegoatVersion = '3.1.4'
24+
scapegoatVersion = '3.1.5'
2525

2626
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator
2727
docsDirName = 'docs'
@@ -72,7 +72,7 @@ dependencies {
7272

7373
// logging
7474
implementation "com.typesafe.scala-logging:scala-logging_${scalaVersion}:3.9.5"
75-
implementation 'ch.qos.logback:logback-classic:1.5.16'
75+
implementation 'ch.qos.logback:logback-classic:1.5.17'
7676

7777
// config
7878
implementation 'com.typesafe:config:1.4.3'
@@ -92,7 +92,7 @@ dependencies {
9292
}
9393

9494
// ie³ power system data model
95-
implementation('com.github.ie3-institute:PowerSystemDataModel:5.1.0') {
95+
implementation('com.github.ie3-institute:PowerSystemDataModel:6.0.0') {
9696
exclude group: 'org.slf4j'
9797
exclude group: 'org.apache.logging.log4j'
9898
exclude group: 'com.github.ie3-institute'
@@ -110,7 +110,7 @@ dependencies {
110110
testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.8' //scalatest html output
111111
testImplementation 'org.pegdown:pegdown:1.6.0'
112112

113-
testImplementation 'org.mockito:mockito-core:5.15.2' // mocking framework
113+
testImplementation 'org.mockito:mockito-core:5.16.0' // mocking framework
114114
testImplementation "org.scalatestplus:mockito-3-12_$scalaVersion:3.2.10.0" // syntactic sugar
115115
}
116116

‎docs/readthedocs/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
myst-parser==4.0.0
2-
Sphinx==8.1.3
1+
myst-parser==4.0.1
2+
Sphinx==8.2.3
33
sphinx-rtd-theme==3.0.2

‎src/main/scala/utils/GridConversion.scala

-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ object GridConversion {
247247
CosPhiFixed.CONSTANT_CHARACTERISTIC,
248248
null,
249249
BdewStandardLoadProfile.H0,
250-
false,
251250
// todo: What to do for econsannual?
252251
0.asWattHour,
253252
ratedPower,

‎src/test/scala/edu/ie3/test/common/GridSupport.scala

-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,6 @@ trait GridSupport {
462462
mock[ReactivePowerCharacteristic],
463463
null,
464464
BdewStandardLoadProfile.H0,
465-
false,
466465
Quantities.getQuantity(3000d, KILOWATTHOUR),
467466
Quantities.getQuantity(10d, KILOWATT),
468467
0.95d,

0 commit comments

Comments
 (0)
Please sign in to comment.