Skip to content

Commit 7c209f9

Browse files
juanpedromorenojuanpedromoreno
authored
Prepare repository for next release and SBT build improvements (#128)
1 parent b93a8f8 commit 7c209f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+113
-138
lines changed

‎.scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.4.2
1+
version=2.6.0
22
style = defaultWithAlign
33
maxColumn = 100
44

‎AUTHORS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ These are the people that have contributed to the _exercises-scalatutorial_ proj
2828
- [![julienrf](https://avatars2.githubusercontent.com/u/332812?v=4&s=20) **julienrf**](https://github.com/julienrf)
2929
- [![juanpedromoreno](https://avatars2.githubusercontent.com/u/4879373?v=4&s=20) **juanpedromoreno**](https://github.com/juanpedromoreno)
3030
- [![jdesiloniz](https://avatars2.githubusercontent.com/u/2835739?v=4&s=20) **jdesiloniz**](https://github.com/jdesiloniz)
31-
- [![kiroco12](https://avatars1.githubusercontent.com/u/48894338?v=4&s=20) **kiroco12**](https://github.com/kiroco12)
3231
- [![47erbot](https://avatars1.githubusercontent.com/u/24799081?v=4&s=20) **47erbot**](https://github.com/47erbot)
32+
- [![kiroco12](https://avatars1.githubusercontent.com/u/48894338?v=4&s=20) **kiroco12**](https://github.com/kiroco12)
3333
- [![FRosner](https://avatars2.githubusercontent.com/u/3427394?v=4&s=20) **FRosner**](https://github.com/FRosner)
3434
- [![MaureenElsberry](https://avatars0.githubusercontent.com/u/17556002?v=4&s=20) **MaureenElsberry**](https://github.com/MaureenElsberry)
3535
- [![sauntimo](https://avatars3.githubusercontent.com/u/2720466?v=4&s=20) **sauntimo**](https://github.com/sauntimo)

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ the code. Pull requests are also welcome.
1111

1212
People are expected to follow the [Code of Conduct](CODE_OF_CONDUCT.md) when discussing _exercises-scalatutorial_ on the Github page or other venues.
1313

14-
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).
14+
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).
1515

1616
## How can I help?
1717

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright (C) 2016-2020 47 Degrees <https://47deg.com>
189+
Copyright (C) 2016-2020 47 Degrees Open Source <https://www.47deg.com>
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎NOTICE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
exercises-scalatutorial
66

7-
Copyright (c) 2016-2020 47 Degrees. All rights reserved.
7+
Copyright (c) 2016-2020 47 Degrees Open Source. All rights reserved.
88

99
Licensed under Apache-2.0. See [LICENSE](LICENSE.md) for terms.

‎build.sbt

+23-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
11
import com.jsuereth.sbtpgp.PgpKeys.publishSigned
22

3+
ThisBuild / organization := "org.scala-exercises"
4+
ThisBuild / githubOrganization := "47degrees"
5+
ThisBuild / scalaVersion := "2.13.2"
6+
7+
publish / skip := true
8+
9+
// This is required by the exercises compiler:
310
publishLocal := (publishLocal dependsOn compile).value
411
publishSigned := (publishSigned dependsOn compile).value
512

613
addCommandAlias("ci-test", "scalafmtCheckAll; scalafmtSbtCheck; test")
7-
addCommandAlias("ci-docs", "github; project-docs/mdoc; headerCreateAll")
14+
addCommandAlias("ci-docs", "github; documentation/mdoc; headerCreateAll")
15+
addCommandAlias("ci-publish", "github; ci-release")
816

917
lazy val exercises = (project in file("."))
10-
.settings(moduleName := "exercises-scalatutorial")
11-
.settings(exercisesSettings)
18+
.settings(name := "exercises-scalatutorial")
19+
.settings(
20+
libraryDependencies ++= Seq(
21+
"org.scala-exercises" %% "exercise-compiler" % "0.6.1",
22+
"org.scala-exercises" %% "definitions" % "0.6.1",
23+
"com.chuusai" %% "shapeless" % "2.3.3",
24+
"org.scalatest" %% "scalatest" % "3.1.2",
25+
"org.scalacheck" %% "scalacheck" % "1.14.3",
26+
"org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0",
27+
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5"
28+
)
29+
)
1230
.enablePlugins(ExerciseCompilerPlugin)
1331

14-
lazy val `project-docs` = (project in file(".docs"))
15-
.aggregate(exercises)
16-
.dependsOn(exercises)
17-
.settings(moduleName := "exercises-project-docs")
18-
.settings(mdocIn := file(".docs"))
32+
lazy val documentation = project
1933
.settings(mdocOut := file("."))
20-
.settings(skip in publish := true)
34+
.settings(publish / skip := true)
2135
.enablePlugins(MdocPlugin)

‎.docs/AUTHORS.md renamed to ‎docs/AUTHORS.md

File renamed without changes.

‎.docs/CODE_OF_CONDUCT.md renamed to ‎docs/CODE_OF_CONDUCT.md

File renamed without changes.

‎.docs/CONTRIBUTING.md renamed to ‎docs/CONTRIBUTING.md

File renamed without changes.

‎.docs/LICENSE.md renamed to ‎docs/LICENSE.md

File renamed without changes.

‎.docs/NOTICE.md renamed to ‎docs/NOTICE.md

File renamed without changes.

‎project/ProjectPlugin.scala

-49
This file was deleted.

‎project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.11
1+
sbt.version=1.3.12

‎project/plugins.sbt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.6.0")
2-
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
3-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
4-
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4")
5-
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
6-
addSbtPlugin("com.alejandrohdezma" %% "sbt-github" % "0.8.0")
7-
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.8.0")
8-
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.8.0")
9-
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.2")
1+
addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.6.1")
2+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
3+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
4+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
5+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
6+
addSbtPlugin("com.alejandrohdezma" % "sbt-github" % "0.8.2")
7+
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.8.2")
8+
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.8.2")
9+
addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0")

‎src/main/scala/scalatutorial/ScalaTutorial.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@ import org.scalaexercises.definitions.Library
2020

2121
import sections._
2222

23-
/** Quickly learn Scala through an interactive tutorial based on the first two courses of the Scala MOOCs.
23+
/**
24+
* Quickly learn Scala through an interactive tutorial based on the first two courses of the Scala MOOCs.
2425
*
2526
* @param name scala_tutorial
2627
*/

‎src/main/scala/scalatutorial/sections/ClassesVsCaseClasses.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@ package scalatutorial.sections
1818

1919
import scalatutorial.utils.{BankAccount, Note}
2020

21-
/** @param name classes_vs_case_classes */
21+
/**
22+
* @param name classes_vs_case_classes */
2223
object ClassesVsCaseClasses extends ScalaTutorialSection {
2324

2425
/**
@@ -74,7 +75,6 @@ object ClassesVsCaseClasses extends ScalaTutorialSection {
7475
* members, whereas this is not the case with regular classes.
7576
*
7677
* = Equality =
77-
*
7878
*/
7979
def equality(res0: Boolean, res1: Boolean): Unit = {
8080
val aliceAccount = new BankAccount

‎src/main/scala/scalatutorial/sections/DefinitionsAndEvaluation.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
1616

1717
package scalatutorial.sections
1818

19-
/** @param name definitions_and_evaluation */
19+
/**
20+
* @param name definitions_and_evaluation */
2021
object DefinitionsAndEvaluation extends ScalaTutorialSection {
2122

2223
/**

‎src/main/scala/scalatutorial/sections/FunctionalLoops.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
1616

1717
package scalatutorial.sections
1818

19-
/** @param name functional_loops */
19+
/**
20+
* @param name functional_loops */
2021
object FunctionalLoops extends ScalaTutorialSection {
2122

2223
/**

‎src/main/scala/scalatutorial/sections/HigherOrderFunctions.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
1616

1717
package scalatutorial.sections
1818

19-
/** @param name higher_order_functions */
19+
/**
20+
* @param name higher_order_functions */
2021
object HigherOrderFunctions extends ScalaTutorialSection {
2122

2223
/**

‎src/main/scala/scalatutorial/sections/ImperativeProgramming.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@ package scalatutorial.sections
1818

1919
import scalatutorial.utils.BankAccount
2020

21-
/** @param name imperative_programming */
21+
/**
22+
* @param name imperative_programming */
2223
object ImperativeProgramming extends ScalaTutorialSection {
2324

2425
/**

‎src/main/scala/scalatutorial/sections/LazyEvaluation.scala

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
1616

1717
package scalatutorial.sections
1818

19-
/** @param name lazy_evaluation */
19+
/**
20+
* @param name lazy_evaluation */
2021
object LazyEvaluation extends ScalaTutorialSection {
2122

2223
/**
@@ -234,9 +235,9 @@ object LazyEvaluation extends ScalaTutorialSection {
234235
def lazyVal(res0: String): Unit = {
235236
val builder = new StringBuilder
236237

237-
val x = { builder += 'x'; 1 }
238+
val x = { builder += 'x'; 1 }
238239
lazy val y = { builder += 'y'; 2 }
239-
def z = { builder += 'z'; 3 }
240+
def z = { builder += 'z'; 3 }
240241

241242
z + y + x + z + y + x
242243

‎src/main/scala/scalatutorial/sections/LexicalScopes.scala

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
1616

1717
package scalatutorial.sections
1818

19-
/** @param name lexical_scopes */
19+
/**
20+
* @param name lexical_scopes */
2021
object LexicalScopes extends ScalaTutorialSection {
2122

2223
/**
@@ -75,7 +76,6 @@ object LexicalScopes extends ScalaTutorialSection {
7576
* == Exercise: Scope Rules ==
7677
*
7778
* What is the value of `result` in the following program?
78-
*
7979
*/
8080
def scopeRules(res0: Int): Unit = {
8181
val x = 0
@@ -286,7 +286,6 @@ object LexicalScopes extends ScalaTutorialSection {
286286
* }}}
287287
*
288288
* = Exercise =
289-
*
290289
*/
291290
def objectScopes(res0: Int): Unit = {
292291
object Foo {

‎src/main/scala/scalatutorial/sections/ObjectOrientedProgramming.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@ package scalatutorial.sections
1818

1919
import scalatutorial.utils.{Empty, NonEmpty}
2020

21-
/** @param name object_oriented_programming */
21+
/**
22+
* @param name object_oriented_programming */
2223
object ObjectOrientedProgramming extends ScalaTutorialSection {
2324

2425
/**

‎src/main/scala/scalatutorial/sections/PolymorphicTypes.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
1616

1717
package scalatutorial.sections
1818

19-
/** @param name polymorphic_types */
19+
/**
20+
* @param name polymorphic_types */
2021
object PolymorphicTypes extends ScalaTutorialSection {
2122

2223
/**

‎src/main/scala/scalatutorial/sections/ScalaTutorialSection.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2020 47 Degrees <https://47deg.com>
2+
* Copyright 2016-2020 47 Degrees Open Source <https://www.47deg.com>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)