Skip to content

Commit 184c233

Browse files
Prepare repository for next release and SBT build improvements (#200)
1 parent c898492 commit 184c233

File tree

89 files changed

+843
-583
lines changed

Some content is hidden

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

89 files changed

+843
-583
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
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

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
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-stdlib_ 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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
exercises-stdlib
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

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +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-stdlib")
11-
.settings(exercisesSettings)
18+
.settings(name := "exercises-stdlib")
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-
.settings(moduleName := "exercises-project-docs")
17-
.settings(mdocIn := file(".docs"))
32+
lazy val documentation = project
1833
.settings(mdocOut := file("."))
19-
.settings(skip in publish := true)
34+
.settings(publish / skip := true)
2035
.enablePlugins(MdocPlugin)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)