Prepare repository for next release and SBT build improvements

juanpedromoreno · juanpedromoreno · commit 0a9343235293 · 2020-06-14T12:55:46.000+02:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -28,7 +28,6 @@ These are the people that have contributed to the _exercises-fpinscala_ project:
 - [![isabelcosta](https://avatars1.githubusercontent.com/u/11148726?v=4&s=20) **isabelcosta**](https://github.com/isabelcosta)
 - [![ricsirigu](https://avatars3.githubusercontent.com/u/5004093?v=4&s=20) **ricsirigu**](https://github.com/ricsirigu)
 - [![angoglez](https://avatars0.githubusercontent.com/u/10107285?v=4&s=20) **angoglez**](https://github.com/angoglez)
-- [![Bhudjo](https://avatars0.githubusercontent.com/u/830963?v=4&s=20) **Bhudjo**](https://github.com/Bhudjo)
 - [![jkmcclellan](https://avatars3.githubusercontent.com/u/52432856?v=4&s=20) **jkmcclellan**](https://github.com/jkmcclellan)
 - [![pdo400](https://avatars1.githubusercontent.com/u/1780993?v=4&s=20) **pdo400**](https://github.com/pdo400)
 - [![sergey-lagutin](https://avatars3.githubusercontent.com/u/11209668?v=4&s=20) **sergey-lagutin**](https://github.com/sergey-lagutin)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -11,7 +11,7 @@ the code. Pull requests are also welcome.
 
 People are expected to follow the [Code of Conduct](CODE_OF_CONDUCT.md) when discussing _exercises-fpinscala_ on the Github page or other venues.
 
-If you are being harassed, please contact one of [us](AUTHORS.md#maintainers) immediately so that we can support you. In case you cannot get in touch with us please write an email to [47 Degrees](mailto:scala-exercises@47deg.com).
+If you are being harassed, please contact one of [us](AUTHORS.md#maintainers) immediately so that we can support you. In case you cannot get in touch with us please write an email to [47 Degrees Open Source](mailto:hello@47deg.com).
 
 ## How can I help?
 
diff --git a/LICENSE.md b/LICENSE.md
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (C)  2016-2020 47 Degrees <https://47deg.com>
+   Copyright (C)  2016-2020 47 Degrees Open Source <https://www.47deg.com>
 
    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.md b/NOTICE.md
@@ -4,6 +4,6 @@
 
 exercises-fpinscala
 
-Copyright (c) 2016-2020 47 Degrees. All rights reserved.
+Copyright (c) 2016-2020 47 Degrees Open Source. All rights reserved.
 
 Licensed under Apache-2.0. See [LICENSE](LICENSE.md) for terms.
diff --git a/build.sbt b/build.sbt
@@ -1,21 +1,36 @@
 import com.jsuereth.sbtpgp.PgpKeys.publishSigned
 
+ThisBuild / organization := "org.scala-exercises"
+ThisBuild / githubOrganization := "47degrees"
+ThisBuild / scalaVersion := "2.13.2"
+
+publish / skip := true
+
+// This is required by the exercises compiler:
 publishLocal := (publishLocal dependsOn compile).value
 publishSigned := (publishSigned dependsOn compile).value
 
 addCommandAlias("ci-test", "scalafmtCheckAll; scalafmtSbtCheck; test")
-addCommandAlias("ci-docs", "github; project-docs/mdoc; headerCreateAll")
+addCommandAlias("ci-docs", "github; documentation/mdoc; headerCreateAll")
+addCommandAlias("ci-publish", "github; ci-release")
 
 lazy val exercises = (project in file("."))
-  .settings(moduleName := "exercises-fpinscala")
-  .settings(exercisesSettings)
+  .settings(name := "exercises-fpinscala")
+  .settings(
+    libraryDependencies ++= Seq(
+      "org.scala-exercises"        %% "exercise-compiler"         % "0.6.1",
+      "org.scala-exercises"        %% "definitions"               % "0.6.1",
+      "org.typelevel"              %% "cats-core"                 % "2.1.1",
+      "com.chuusai"                %% "shapeless"                 % "2.3.3",
+      "org.scalatest"              %% "scalatest"                 % "3.1.2",
+      "org.scalacheck"             %% "scalacheck"                % "1.14.3",
+      "org.scalatestplus"          %% "scalacheck-1-14"           % "3.1.2.0",
+      "com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5"
+    )
+  )
   .enablePlugins(ExerciseCompilerPlugin)
 
-lazy val `project-docs` = (project in file(".docs"))
-  .aggregate(exercises)
-  .dependsOn(exercises)
-  .settings(moduleName := "exercises-project-docs")
-  .settings(mdocIn := file(".docs"))
+lazy val documentation = project
   .settings(mdocOut := file("."))
-  .settings(skip in publish := true)
+  .settings(publish / skip := true)
   .enablePlugins(MdocPlugin)
diff --git a/docs/AUTHORS.md b/docs/AUTHORS.md
diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
diff --git a/docs/LICENSE.md b/docs/LICENSE.md
diff --git a/docs/NOTICE.md b/docs/NOTICE.md
diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.11
+sbt.version=1.3.12
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,9 +1,9 @@
-addSbtPlugin("org.scala-exercises" % "sbt-exercise"      % "0.6.0")
-addSbtPlugin("com.geirsson"        % "sbt-ci-release"    % "1.5.3")
-addSbtPlugin("org.scalameta"       % "sbt-mdoc"          % "2.1.5")
-addSbtPlugin("org.scalameta"       % "sbt-scalafmt"      % "2.3.4")
-addSbtPlugin("de.heikoseeberger"   % "sbt-header"        % "5.6.0")
-addSbtPlugin("com.alejandrohdezma" %% "sbt-github"       % "0.8.0")
-addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.8.0")
-addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc"   % "0.8.0")
-addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc"      % "0.2")
+addSbtPlugin("org.scala-exercises" % "sbt-exercise"             % "0.6.1")
+addSbtPlugin("com.geirsson"        % "sbt-ci-release"           % "1.5.3")
+addSbtPlugin("org.scalameta"       % "sbt-mdoc"                 % "2.1.5")
+addSbtPlugin("org.scalameta"       % "sbt-scalafmt"             % "2.4.0")
+addSbtPlugin("de.heikoseeberger"   % "sbt-header"               % "5.6.0")
+addSbtPlugin("com.alejandrohdezma" % "sbt-github"               % "0.8.2")
+addSbtPlugin("com.alejandrohdezma" % "sbt-github-header"        % "0.8.2")
+addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc"          % "0.8.2")
+addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0")
diff --git a/src/main/scala/fpinscalalib/ErrorHandlingSection.scala b/src/main/scala/fpinscalalib/ErrorHandlingSection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/FPinScalaLibrary.scala b/src/main/scala/fpinscalalib/FPinScalaLibrary.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/FunctionalDataStructuresSection.scala b/src/main/scala/fpinscalalib/FunctionalDataStructuresSection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/FunctionalParallelismSection.scala b/src/main/scala/fpinscalalib/FunctionalParallelismSection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/FunctionalStateSection.scala b/src/main/scala/fpinscalalib/FunctionalStateSection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/GettingStartedWithFPSection.scala b/src/main/scala/fpinscalalib/GettingStartedWithFPSection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/ParserCombinatorsSection.scala b/src/main/scala/fpinscalalib/ParserCombinatorsSection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/PropertyBasedTestingSection.scala b/src/main/scala/fpinscalalib/PropertyBasedTestingSection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/StrictnessAndLazinessSection.scala b/src/main/scala/fpinscalalib/StrictnessAndLazinessSection.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/errorhandling/EitherHelper.scala b/src/main/scala/fpinscalalib/customlib/errorhandling/EitherHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/errorhandling/ExampleHelper.scala b/src/main/scala/fpinscalalib/customlib/errorhandling/ExampleHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/errorhandling/OptionHelper.scala b/src/main/scala/fpinscalalib/customlib/errorhandling/OptionHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/functionaldatastructures/ListHelper.scala b/src/main/scala/fpinscalalib/customlib/functionaldatastructures/ListHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/functionaldatastructures/TreeHelper.scala b/src/main/scala/fpinscalalib/customlib/functionaldatastructures/TreeHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/functionalparallelism/ParHelper.scala b/src/main/scala/fpinscalalib/customlib/functionalparallelism/ParHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/laziness/ExampleHelper.scala b/src/main/scala/fpinscalalib/customlib/laziness/ExampleHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/laziness/StreamHelper.scala b/src/main/scala/fpinscalalib/customlib/laziness/StreamHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/parsing/JSON.scala b/src/main/scala/fpinscalalib/customlib/parsing/JSON.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/parsing/ParsersHelper.scala b/src/main/scala/fpinscalalib/customlib/parsing/ParsersHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/parsing/Reference.scala b/src/main/scala/fpinscalalib/customlib/parsing/Reference.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/state/StateHelper.scala b/src/main/scala/fpinscalalib/customlib/state/StateHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/main/scala/fpinscalalib/customlib/testing/GenHelper.scala b/src/main/scala/fpinscalalib/customlib/testing/GenHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/test/scala/fpinscalalib/ErrorHandlingSpec.scala b/src/test/scala/fpinscalalib/ErrorHandlingSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/test/scala/fpinscalalib/FunctionalDataStructuresSpec.scala b/src/test/scala/fpinscalalib/FunctionalDataStructuresSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/test/scala/fpinscalalib/FunctionalParalellismSpec.scala b/src/test/scala/fpinscalalib/FunctionalParalellismSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/test/scala/fpinscalalib/FunctionalStateSpec.scala b/src/test/scala/fpinscalalib/FunctionalStateSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/test/scala/fpinscalalib/GettingStartedWithFPSpec.scala b/src/test/scala/fpinscalalib/GettingStartedWithFPSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/test/scala/fpinscalalib/ParserCombinatorsSpec.scala b/src/test/scala/fpinscalalib/ParserCombinatorsSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/test/scala/fpinscalalib/PropertyBasedTestingSpec.scala b/src/test/scala/fpinscalalib/PropertyBasedTestingSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * 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/src/test/scala/fpinscalalib/StrictnessAndLazinessSpec.scala b/src/test/scala/fpinscalalib/StrictnessAndLazinessSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 47 Degrees <https://47deg.com>
+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=1.3.11`
	`1`	`+sbt.version=1.3.12`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2016-2020 47 Degrees <https://47deg.com>`
	`2`	`+ * Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`