Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b45413d
Upgraded to `scala3`.
staudtMarius Feb 18, 2025
0840bc9
Merge branch 'dev' into ms/#251-upgrade-to-scala3
staudtMarius Feb 18, 2025
8424801
Merge branch 'dev' into ms/#251-upgrade-to-scala3
staudtMarius Apr 22, 2025
f528580
Updating `PSU` to version `3.0.0`.
staudtMarius Apr 22, 2025
5eeffd5
Bump tech.units:indriya from 2.2.2 to 2.2.3
dependabot[bot] Apr 25, 2025
77f326f
Merge pull request #280 from ie3-institute/dependabot/gradle/dev/tech…
github-actions[bot] May 7, 2025
df2c199
Bump com.github.spotbugs from 6.1.7 to 6.1.10
dependabot[bot] May 7, 2025
766d628
Merge pull request #281 from ie3-institute/dependabot/gradle/dev/com.…
github-actions[bot] May 7, 2025
fff3a73
Merge branch 'dev' into ms/#251-upgrade-to-scala3
staudtMarius May 7, 2025
a1a637e
Bump com.github.spotbugs from 6.1.10 to 6.1.11
dependabot[bot] May 8, 2025
dc896fe
Merge pull request #282 from ie3-institute/dependabot/gradle/dev/com.…
github-actions[bot] May 8, 2025
1a21672
Bump com.github.ie3-institute:PowerSystemUtils from 2.2.1 to 3.1.0
dependabot[bot] May 8, 2025
8e0f76a
Merge pull request #283 from ie3-institute/dependabot/gradle/dev/com.…
staudtMarius May 8, 2025
f95f51b
Merge branch 'dev' into ms/#251-upgrade-to-scala3
staudtMarius May 8, 2025
72d5fa4
Bump com.github.ie3-institute:PowerSystemDataModel from 6.0.0 to 7.0.…
dependabot[bot] May 9, 2025
3ac4e85
Merge branch 'dev' into ms/#251-upgrade-to-scala3
staudtMarius May 9, 2025
300b452
Fix entries in `CHANGELOG`.
staudtMarius May 9, 2025
575df07
Merge pull request #252 from ie3-institute/ms/#251-upgrade-to-scala3
sebastian-peter May 9, 2025
36f8103
Merge branch 'dev' into sp/#286-release-0.9.0
sebastian-peter May 9, 2025
e4dec0b
Adapting changelog for release
sebastian-peter May 9, 2025
7f28597
Increasing version to 0.9
sebastian-peter May 9, 2025
3dada44
Bumping gradle to 8.14
sebastian-peter May 9, 2025
656ff86
Updating scala to 3.7.0
sebastian-peter May 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased/Snapshot]

## [0.9.0] - 2025-05-09

### Changed
- Updated to `scala3` [#251](https://github.com/ie3-institute/simonaAPI/issues/251)

### Updates
- Updated PSU to 3.1.0
- Updated PSDM to 7.0.0

## [0.8.0] - 2025-04-17

### Added
Expand Down Expand Up @@ -65,7 +74,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Renamed messages to ease understanding [#62](https://github.com/ie3-institute/simonaAPI/issues/62)
- Separating departures and arrivals in message protocol, properly handling exceptions [#77](https://github.com/ie3-institute/simonaAPI/issues/77)

[Unreleased/Snapshot]: https://github.com/ie3-institute/simonaapi/compare/0.8.0...HEAD
[Unreleased/Snapshot]: https://github.com/ie3-institute/simonaapi/compare/0.9.0...HEAD
[0.9.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.8.0...0.9.0
[0.8.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.7.0...0.8.0
[0.7.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.6.0...0.7.0
[0.6.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/0.5.0...0.6.0
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'java' // java support
id 'com.diffplug.spotless' version '7.0.3'//code format
id 'pmd' // code check, working on source code
id 'com.github.spotbugs' version '6.1.7' // code check, working on byte code
id 'com.github.spotbugs' version '6.1.11' // code check, working on byte code
id "org.sonarqube" version "6.1.0.5360" // sonarqube
id 'signing'
id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined)
Expand All @@ -17,8 +17,8 @@ ext {
scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator // location of script plugins

// required for pekko
scalaVersion = "2.13"
scalaBinaryVersion = "2.13.16"
scalaVersion = '3'
scalaBinaryVersion = '3.7.0'
pekkoVersion = "1.1.3"
}

Expand Down Expand Up @@ -48,21 +48,21 @@ repositories {

dependencies{

implementation 'tech.units:indriya:2.2.2' // quantities
implementation 'tech.units:indriya:2.2.3' // quantities

// scala (needed for pekko)
implementation "org.scala-lang:scala-library:${scalaBinaryVersion}"
implementation "org.scala-lang:scala3-library_${scalaVersion}:${scalaBinaryVersion}"

//PSU
implementation('com.github.ie3-institute:PowerSystemUtils:2.2.1') {
implementation('com.github.ie3-institute:PowerSystemUtils:3.1.0') {
exclude group: 'org.apache.logging.log4j'
exclude group: 'org.slf4j'
/* Exclude our own nested dependencies */
exclude group: 'com.github.ie3-institute'
}

//PSDM
implementation('com.github.ie3-institute:PowerSystemDataModel:6.0.0') {
implementation('com.github.ie3-institute:PowerSystemDataModel:7.0.0') {
exclude group: 'org.apache.logging.log4j'
exclude group: 'org.slf4j'
/* Exclude our own nested dependencies */
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 2 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -206,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
Expand Down
6 changes: 3 additions & 3 deletions version.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Generated by the Semver Plugin for Gradle
#Tue Mar 11 17:00:20 CET 2025
#Fri May 09 09:31:50 CEST 2025
version.buildmeta=
version.major=0
version.minor=8
version.minor=9
version.patch=0
version.prerelease=
version.semver=0.8.0
version.semver=0.9.0