From b45413dbdac7f94a6cf2371257afb31f22b40a5a Mon Sep 17 00:00:00 2001 From: staudtMarius Date: Tue, 18 Feb 2025 15:24:20 +0100 Subject: [PATCH 1/3] Upgraded to `scala3`. --- CHANGELOG.md | 3 +++ build.gradle | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 841c859a..1d68eec8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added Bao and Staudt to the list of reviewers [#216](https://github.com/ie3-institute/simonaAPI/issues/216) - Documentation for this API [#230](https://github.com/ie3-institute/simonaAPI/issues/230) +### Changed +- Upgraded to `scala3` [#251](https://github.com/ie3-institute/simonaAPI/issues/251) + ## [0.6.0] - 2024-12-02 ### Added diff --git a/build.gradle b/build.gradle index aa5fecf2..996a245b 100644 --- a/build.gradle +++ b/build.gradle @@ -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.6.2' pekkoVersion = "1.1.3" } @@ -50,7 +50,7 @@ dependencies{ implementation 'tech.units:indriya:2.2.2' // 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') { From f528580b209da7ade44a1d3e53c580e77c7615a9 Mon Sep 17 00:00:00 2001 From: staudtMarius Date: Tue, 22 Apr 2025 11:36:57 +0200 Subject: [PATCH 2/3] Updating `PSU` to version `3.0.0`. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9c2a848d..5e8dcec3 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ ext { // required for pekko scalaVersion = '3' - scalaBinaryVersion = '3.6.2' + scalaBinaryVersion = '3.6.4' pekkoVersion = "1.1.3" } @@ -54,7 +54,7 @@ dependencies{ 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.0.0') { exclude group: 'org.apache.logging.log4j' exclude group: 'org.slf4j' /* Exclude our own nested dependencies */ From 300b45233b2206a2417c8dd81bb9a4995e04e859 Mon Sep 17 00:00:00 2001 From: staudtMarius Date: Fri, 9 May 2025 08:38:19 +0200 Subject: [PATCH 3/3] Fix entries in `CHANGELOG`. --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d6625d..07e987c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased/Snapshot] + +### 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 - Implementing auto-merge for dependabot PRs [#273](https://github.com/ie3-institute/simonaAPI/issues/273) - Implemented GitHub Actions pipeline [#247](https://github.com/ie3-institute/simonaAPI/issues/247) @@ -20,7 +30,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 #### Changed - Updated PSDM to 6.0.0 -- Upgraded to `scala3` [#251](https://github.com/ie3-institute/simonaAPI/issues/251) ## [0.6.0] - 2024-12-02