diff --git a/LICENSE b/LICENSE index d28032056..15ea5e3e9 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright © 2016-2019 Lightbend Inc. + Copyright © 2020-2023 Lunatech Labs Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/NOTICE b/NOTICE index 4de67af28..dc6aa30f7 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Copyright 2016-2019 Lightbend Inc. +Copyright 2020-2023 Lunatech Labs Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 852276135..7e120737d 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ This repository is structured in such a way that it can be transformed into two - A _studentified_ repository: this is a standalone sbt project which is typically used for teaching or learning purposes. A user of this repository will be working on one exercise at any one point in time and will be able to use a number of commands via the `cmtc` cli: + - `cmtc set-course-root`: Sets the location of the current course as the default location for subsequent cmtc command invocations. - `cmtc list-exercises`: will print a list of all available exercises. The current exercise is marked with a **_*_**. - `cmtc next-exercise`: move to the next exercise and pull in the tests (if any) and exercise instructions for that exercise. This command preserves the current state of the application leaving any code added or changed by the student unmodified. - `cmtc previous-exercise`: the opposite of the `next-exercise` command. @@ -47,9 +48,9 @@ This repository is structured in such a way that it can be transformed into two repo by a process of `delinearization` - _There is a second use case for a linearized repo: it can can be used to inspect the differences between consecutive exercises (using a tools such as `SourceTree` or `GitKraken`)_ -_Studentification_, _linearization_, and _delinearization_ as well as some administrative tasks (such as renumbering exercises), is done using the so-called [Course Management Tools](https://github.com/lightbend/course-management-tools). +_Studentification_, _linearization_, and _delinearization_ as well as some administrative tasks (such as renumbering exercises), is done using the so-called [Course Management Tools](https://github.com/lunatech-labs/course-management-tools). -In the following sections, we'll explain `studentify`, `linearize` and `delinearize` commands. +In the following sections, we'll explain how to `studentify` this course. ### How to _"studentify"_ a master repository diff --git a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index 2b593cf5d..b1ffc0919 100644 --- a/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_000_sudoku_solver_initial_state/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index 2b593cf5d..b1ffc0919 100644 --- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/resources/logback-test.xml b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/resources/logback-test.xml index addb019f6..9b428737e 100644 --- a/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/resources/logback-test.xml +++ b/exercises/exercise_001_dotty_deprecated_syntax_rewriting/src/test/resources/logback-test.xml @@ -9,28 +9,12 @@ - - ${coffee-house.log-file:-coffee-house.log} - - %date{HH:mm:ss} %-5level [%X{akkaSource}] - %msg%n - - - - - - - - - - - - diff --git a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index 314b383e5..584068246 100644 --- a/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_002_dotty_new_syntax_and_indentation_based_syntax/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_003_top_level_definitions/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_004_parameter_untupling/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_005_extension_methods/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_006_using_and_summon/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_007_givens/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_008_enum_and_export/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_009_union_types/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_010_opaque_type_aliases/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_011_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_020_opaque_type_aliases_alt/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala index a951095d1..9847e58de 100644 --- a/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala +++ b/exercises/exercise_021_multiversal_equality/src/main/scala/org/lunatechlabs/dotty/SudokuSolverMain.scala @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2020 Lightbend, Inc. + * Copyright © 2020-2023 Lunatech Labs. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * * NO COMMERCIAL SUPPORT OR ANY OTHER FORM OF SUPPORT IS OFFERED ON - * THIS SOFTWARE BY LIGHTBEND, Inc. + * THIS SOFTWARE BY Lunatech Labs. * * See the License for the specific language governing permissions and * limitations under the License. diff --git a/slide-deck/README.md b/slides/README.md similarity index 100% rename from slide-deck/README.md rename to slides/README.md diff --git a/slides/illustrations/sudoku.png b/slides/illustrations/sudoku.png new file mode 100644 index 000000000..eaa0c64e8 Binary files /dev/null and b/slides/illustrations/sudoku.png differ diff --git a/slides/sudoku.graffle b/slides/sudoku.graffle new file mode 100644 index 000000000..0c1270597 Binary files /dev/null and b/slides/sudoku.graffle differ