From 5fd315a440acc3ccab72a2ba4737311f7476cf54 Mon Sep 17 00:00:00 2001 From: eloots Date: Fri, 6 Nov 2020 20:13:36 +0100 Subject: [PATCH] Bump Dotty version to Scala 3.0.0-M1/Remove workaround/Correct extensions syntax - Dotty 0.27.0-RC1 broke logging calls due to [Ambiguous overload between varargs and non-varargs #9688](https://github.com/lampepfl/dotty/issues/9688) which was fixed in [Fix vararg overloading #9732](https://github.com/lampepfl/dotty/pull/9732) - Remove a few remaining extension methods that still used an 'older' extension mothod syntax --- .gitignore | 3 ++- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala | 3 ++- .../lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala | 6 ++---- .../scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala | 3 +-- .../org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala | 3 ++- exercises/project/Dependencies.scala | 6 +++--- exercises/project/build.properties | 2 +- exercises/project/plugins.sbt | 2 +- 30 files changed, 47 insertions(+), 80 deletions(-) diff --git a/.gitignore b/.gitignore index 5669c4920..d3fa0add8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,10 +9,11 @@ collectedLogs.zip .vscode *.code-workspace -# Metals/Bloop specific +# Metals/Bloop/sbt BSP specific .bloop/ .metals/ .swp +.bsp **/project/metals.sbt # sbt specific diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 1ec983f19..65d52e421 100644 --- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -40,8 +40,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -59,8 +58,7 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } } diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 195fd157e..d35a5bffc 100644 --- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 1ec983f19..65d52e421 100644 --- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -40,8 +40,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -59,8 +58,7 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } } diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 59c7d8cc3..a6b9b3a96 100644 --- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 1ec983f19..65d52e421 100644 --- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -40,8 +40,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -59,8 +58,7 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } } diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 195fd157e..d35a5bffc 100644 --- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -90,8 +90,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 5de00ef7b..fdb6a999d 100644 --- a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -39,8 +39,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -58,7 +57,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 3d1bb81ef..c92377ec3 100644 --- a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 2b8be98af..300e57d2d 100644 --- a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -38,8 +38,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -57,7 +56,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 2198ad5dc..1ca9e7a07 100644 --- a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 2b8be98af..300e57d2d 100644 --- a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -38,8 +38,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -57,7 +56,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 2198ad5dc..1ca9e7a07 100644 --- a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 2b8be98af..300e57d2d 100644 --- a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -38,8 +38,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -57,7 +56,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 9cab9de3a..3969ace95 100644 --- a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 2b8be98af..300e57d2d 100644 --- a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -38,8 +38,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -57,7 +56,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 9cab9de3a..3969ace95 100644 --- a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -88,8 +88,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 4ab2464cd..d1de829cc 100644 --- a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -41,8 +41,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -60,7 +59,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index b35037e8e..d8761c284 100644 --- a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -86,8 +86,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.Command], progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 4ab2464cd..d1de829cc 100644 --- a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -41,8 +41,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -60,7 +59,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 70e95e63b..a2dbebee3 100644 --- a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -80,8 +80,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.CommandAndRespons progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 4ab2464cd..d1de829cc 100644 --- a/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -41,8 +41,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -60,7 +59,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 3d3cc67d9..de0f2e696 100644 --- a/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -80,8 +80,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.CommandAndRespons progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala b/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala index 208927faf..a5da02c7e 100644 --- a/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala +++ b/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala @@ -30,7 +30,8 @@ extension[A] (updates: CellUpdates) def size: Int = updates.size -def (update: (Int, Set[Int])) +: (updates: CellUpdates): CellUpdates = update +: updates +extension (update: (Int, Set[Int])) + def +: (updates: CellUpdates): CellUpdates = update +: updates import SudokuDetailProcessor.RowUpdate diff --git a/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala b/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala index 4ab2464cd..d1de829cc 100644 --- a/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala +++ b/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuProgressTracker.scala @@ -41,8 +41,7 @@ class SudokuProgressTracker private ( case NewUpdatesInFlight(updateCount) => trackProgress(updatesInFlight + updateCount) case msg: SudokuDetailState => - // context.log.error("Received unexpected message in state 'trackProgress': {}", msg) - context.log.error(s"Received unexpected message in state 'trackProgress': ${msg}") + context.log.error("Received unexpected message in state 'trackProgress': {}", msg) Behaviors.same } @@ -60,7 +59,6 @@ class SudokuProgressTracker private ( case detail: SudokuDetailState => collectEndState(remainingRows = remainingRows - 1, detail +: endState) case msg: NewUpdatesInFlight => - // context.log.error("Received unexpected message in state 'collectEndState': {}", msg) - context.log.error(s"Received unexpected message in state 'collectEndState': ${msg}") + context.log.error("Received unexpected message in state 'collectEndState': {}", msg) Behaviors.same } diff --git a/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala b/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala index 3d3cc67d9..de0f2e696 100644 --- a/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala +++ b/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/SudokuSolver.scala @@ -80,8 +80,7 @@ class SudokuSolver private (context: ActorContext[SudokuSolver.CommandAndRespons progressTracker ! SudokuProgressTracker.NewUpdatesInFlight(rowUpdates.size) processRequest(Some(sender), System.currentTimeMillis()) case unexpectedMsg => - // context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) - context.log.error(s"Received an unexpected message in 'idle' state: ${unexpectedMsg}") + context.log.error("Received an unexpected message in 'idle' state: {}", unexpectedMsg) Behaviors.same } diff --git a/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala b/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala index 0544ad358..eb3180ca8 100644 --- a/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala +++ b/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/sudoku/TopLevelDefinitions.scala @@ -32,7 +32,8 @@ extension[A] (updates: CellUpdates) def size: Int = updates.size -def (update: (Int, Set[Int])) +: (updates: CellUpdates): CellUpdates = update +: updates +extension (update: (Int, Set[Int])) + def +: (updates: CellUpdates): CellUpdates = update +: updates import SudokuDetailProcessor.RowUpdate diff --git a/exercises/project/Dependencies.scala b/exercises/project/Dependencies.scala index ff81c4e16..379755628 100644 --- a/exercises/project/Dependencies.scala +++ b/exercises/project/Dependencies.scala @@ -21,10 +21,10 @@ import sbt._ object Version { - val akkaVer = "2.6.8" + val akkaVer = "2.6.10" val logbackVer = "1.2.3" - val mUnitVer = "0.7.12" - val scalaVersion = "0.27.0-RC1" + val mUnitVer = "0.7.16" + val scalaVersion = "3.0.0-M1" } object Dependencies { diff --git a/exercises/project/build.properties b/exercises/project/build.properties index 0837f7a13..08e4d7933 100644 --- a/exercises/project/build.properties +++ b/exercises/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.4.1 diff --git a/exercises/project/plugins.sbt b/exercises/project/plugins.sbt index 4e41fdfb9..be2066311 100644 --- a/exercises/project/plugins.sbt +++ b/exercises/project/plugins.sbt @@ -1,5 +1,5 @@ // SBT Dotty plugin -addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.1") +addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.5")