Skip to content

Commit 07a3e65

Browse files
Merge pull request #141 from ie3-institute/rel/sp/#140-release-0.4.0
Release 0.4.0
2 parents 8a9a207 + df4815c commit 07a3e65

File tree

8 files changed

+25
-20
lines changed

8 files changed

+25
-20
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased/Snapshot]
88

9+
## [0.4.0] - 2023-11-22
10+
11+
### Changed
12+
- Replacing akka with pekko [#138](https://github.com/ie3-institute/simonaAPI/issues/138)
13+
914
## [0.3.0] - 2023-11-19
1015

1116
### Changed
@@ -25,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2530
- Renamed messages to ease understanding [#62](https://github.com/ie3-institute/simonaAPI/issues/62)
2631
- Separating departures and arrivals in message protocol, properly handling exceptions [#77](https://github.com/ie3-institute/simonaAPI/issues/77)
2732

28-
[Unreleased/Snapshot]: https://github.com/ie3-institute/simonaapi/compare/0.3.0...HEAD
33+
[Unreleased/Snapshot]: https://github.com/ie3-institute/simonaapi/compare/0.4.0...HEAD
34+
[0.4.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.3.0...0.4.0
2935
[0.3.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.2.0...0.3.0
3036
[0.2.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/e3f0c247d9d2a92840f49412aa729c5f033cb4de...0.2.0

build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ ext {
1515
javaVersion = JavaVersion.VERSION_17
1616
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator // location of script plugins
1717

18-
// required for akka
18+
// required for pekko
1919
scalaVersion = "2.13"
20-
2120
scalaBinaryVersion = "2.13.12"
21+
pekkoVersion = "1.0.1"
2222
}
2323

2424
group = 'com.github.ie3-institute'
@@ -48,13 +48,12 @@ dependencies{
4848

4949
implementation 'tech.units:indriya:2.2' // quantities
5050

51-
// scala (needed for akka)
51+
// scala (needed for pekko)
5252
implementation "org.scala-lang:scala-library:${scalaBinaryVersion}"
5353

54-
// akka
55-
implementation platform("com.typesafe.akka:akka-bom_${scalaVersion}:2.6.21")
56-
implementation "com.typesafe.akka:akka-actor_${scalaVersion}"
57-
testImplementation "com.typesafe.akka:akka-testkit_${scalaVersion}"
54+
// pekko
55+
implementation "org.apache.pekko:pekko-actor_${scalaVersion}:${pekkoVersion}"
56+
testImplementation "org.apache.pekko:pekko-testkit_${scalaVersion}:${pekkoVersion}" // pekko testkit
5857

5958
// TESTING
6059
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'

src/main/java/edu/ie3/simona/api/data/ev/ExtEvData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
package edu.ie3.simona.api.data.ev;
88

9-
import akka.actor.ActorRef;
109
import edu.ie3.simona.api.data.ExtData;
1110
import edu.ie3.simona.api.data.ev.model.EvModel;
1211
import edu.ie3.simona.api.data.ev.ontology.*;
1312
import edu.ie3.simona.api.data.ontology.ScheduleDataServiceMessage;
1413
import java.util.*;
1514
import java.util.concurrent.LinkedBlockingQueue;
15+
import org.apache.pekko.actor.ActorRef;
1616

1717
public class ExtEvData implements ExtData {
1818
/** Data message queue containing messages from SIMONA */

src/main/java/edu/ie3/simona/api/data/ontology/ScheduleDataServiceMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
package edu.ie3.simona.api.data.ontology;
88

9-
import akka.actor.ActorRef;
109
import java.util.Objects;
10+
import org.apache.pekko.actor.ActorRef;
1111

1212
public class ScheduleDataServiceMessage {
1313
private final ActorRef dataService;

src/main/java/edu/ie3/simona/api/simulation/ExtSimAdapterData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
package edu.ie3.simona.api.simulation;
88

9-
import akka.actor.ActorRef;
109
import edu.ie3.simona.api.simulation.ontology.ControlMessageToExt;
1110
import edu.ie3.simona.api.simulation.ontology.ControlResponseMessageFromExt;
1211
import java.util.concurrent.LinkedBlockingQueue;
12+
import org.apache.pekko.actor.ActorRef;
1313

1414
public class ExtSimAdapterData {
1515

src/test/groovy/edu/ie3/simona/api/data/ev/ExtEvDataTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package edu.ie3.simona.api.data.ev
22

3-
import akka.actor.ActorSystem
4-
import akka.testkit.TestProbe
5-
import akka.testkit.javadsl.TestKit
3+
import org.apache.pekko.actor.ActorSystem
4+
import org.apache.pekko.testkit.TestProbe
5+
import org.apache.pekko.testkit.javadsl.TestKit
66
import edu.ie3.simona.api.data.ev.model.EvModel
77
import edu.ie3.simona.api.data.ev.ontology.ProvideArrivingEvs
88
import edu.ie3.simona.api.data.ev.ontology.ProvideCurrentPrices

src/test/groovy/edu/ie3/simona/api/simulation/ExtSimulationSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package edu.ie3.simona.api.simulation
22

3-
import akka.actor.ActorSystem
4-
import akka.testkit.TestProbe
5-
import akka.testkit.javadsl.TestKit
3+
import org.apache.pekko.actor.ActorSystem
4+
import org.apache.pekko.testkit.TestProbe
5+
import org.apache.pekko.testkit.javadsl.TestKit
66
import edu.ie3.simona.api.data.ExtData
77
import edu.ie3.simona.api.simulation.ontology.ActivationMessage
88
import edu.ie3.simona.api.simulation.ontology.CompletionMessage

version.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#Generated by the Semver Plugin for Gradle
2-
#Wed Aug 02 00:22:35 CEST 2023
2+
#Mon Nov 20 00:22:50 CET 2023
33
version.buildmeta=
44
version.major=0
5-
version.minor=3
5+
version.minor=4
66
version.patch=0
77
version.prerelease=
8-
version.semver=0.3.0
8+
version.semver=0.4.0

0 commit comments

Comments
 (0)