diff --git a/CHANGELOG.md b/CHANGELOG.md index eaed6a16..497babad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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 diff --git a/build.gradle b/build.gradle index 77f4e9aa..0a053a9d 100644 --- a/build.gradle +++ b/build.gradle @@ -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) @@ -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" } @@ -48,13 +48,13 @@ 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 */ @@ -62,7 +62,7 @@ dependencies{ } //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 */ diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..9bbc975c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..ca025c83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index f5feea6d..faf93008 100755 --- a/gradlew +++ b/gradlew @@ -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 @@ -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. diff --git a/version.properties b/version.properties index c3b49187..0faae71e 100644 --- a/version.properties +++ b/version.properties @@ -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