Skip to content

Commit 161ea15

Browse files
juanpedromorenojuanpedromoreno
authored
Updates Project (#169)
1 parent 354559e commit 161ea15

28 files changed

+318
-145
lines changed

‎.scalafmt.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version=2.4.2
12
style = defaultWithAlign
23
maxColumn = 100
34

@@ -19,5 +20,4 @@ docstrings = JavaDoc
1920
rewrite {
2021
rules = [SortImports, RedundantBraces]
2122
redundantBraces.maxLines = 1
22-
}
23-
23+
}

‎.travis.yml

-18
This file was deleted.

‎LICENSE.md

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright (C) 2016-2020 47 Degrees <https://47deg.com>
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Scala Exercises - Stdlib library
2-
------------------------
32

43
This repository hosts a content library for the [Scala Exercises](https://www.scala-exercises.org/) platform, including interactive exercises related to the Scala standard library.
54

‎build.sbt

+12-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
1-
val scalaExercisesV = "0.6.0-SNAPSHOT"
1+
addCommandAlias("ci-test", "scalafmtCheckAll; scalafmtSbtCheck; test")
2+
addCommandAlias("ci-docs", "github; project-docs/mdoc; headerCreateAll")
23

3-
def dep(artifactId: String) =
4-
"org.scala-exercises" %% artifactId % scalaExercisesV excludeAll (ExclusionRule("io.monix"))
5-
6-
lazy val stdlib = (project in file("."))
4+
lazy val exercises = (project in file("."))
5+
.settings(moduleName := "exercises-stdlib")
6+
.settings(exercisesSettings)
77
.enablePlugins(ExerciseCompilerPlugin)
8-
.settings(
9-
name := "exercises-stdlib",
10-
libraryDependencies ++= Seq(
11-
dep("exercise-compiler"),
12-
dep("definitions"),
13-
%%("shapeless", V.shapeless),
14-
%%("scalatest", V.scalatest),
15-
%%("scalacheck", V.scalacheck),
16-
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless,
17-
"org.scalatestplus" %% "scalatestplus-scalacheck" % V.scalatestplusScheck
18-
)
19-
)
20-
21-
// Distribution
228

23-
pgpPassphrase := Some(getEnvVar("PGP_PASSPHRASE").getOrElse("").toCharArray)
24-
pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
25-
pgpSecretRing := file(s"$gpgFolder/secring.gpg")
9+
lazy val `project-docs` = (project in file(".docs"))
10+
.aggregate(exercises)
11+
.settings(moduleName := "exercises-project-docs")
12+
.settings(mdocIn := file(".docs"))
13+
.settings(mdocOut := file("."))
14+
.settings(skip in publish := true)
15+
.enablePlugins(MdocPlugin)

‎project/ProjectPlugin.scala

+25-32
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,49 @@
1-
//import de.heikoseeberger.sbtheader.HeaderPattern
2-
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
3-
import de.heikoseeberger.sbtheader.License._
41
import sbt.Keys._
52
import sbt._
6-
import sbtorgpolicies._
7-
import sbtorgpolicies.model._
8-
import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
3+
import com.alejandrohdezma.sbt.github.SbtGithubPlugin
94

105
object ProjectPlugin extends AutoPlugin {
116

127
override def trigger: PluginTrigger = allRequirements
138

14-
override def requires: Plugins = plugins.JvmPlugin && OrgPoliciesPlugin
9+
override def requires: Plugins = plugins.JvmPlugin && SbtGithubPlugin
1510

1611
object autoImport {
1712

1813
lazy val V = new {
19-
val scala213: String = "2.13.1"
2014
val shapeless: String = "2.3.3"
21-
val scalatest: String = "3.1.1"
22-
val scalatestplusScheck: String = "3.1.0.0-RC2"
15+
val scala: String = "2.13.2"
16+
val scalaExercises: String = "0.6.0-SNAPSHOT"
2317
val scalacheck: String = "1.14.3"
2418
val scalacheckShapeless: String = "1.2.5"
19+
val scalatest: String = "3.1.1"
20+
val scalatestplusScheck: String = "3.1.1.1"
2521
}
26-
}
2722

28-
import autoImport._
23+
def dep(artifactId: String) = "org.scala-exercises" %% artifactId % V.scalaExercises
24+
25+
lazy val exercisesSettings = Seq(
26+
libraryDependencies ++= Seq(
27+
dep("exercise-compiler"),
28+
dep("definitions"),
29+
"com.chuusai" %% "shapeless" % V.shapeless,
30+
"org.scalatest" %% "scalatest" % V.scalatest,
31+
"org.scalacheck" %% "scalacheck" % V.scalacheck,
32+
"org.scalatestplus" %% "scalacheck-1-14" % V.scalatestplusScheck,
33+
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % V.scalacheckShapeless
34+
)
35+
)
36+
}
2937

3038
override def projectSettings: Seq[Def.Setting[_]] =
3139
Seq(
32-
description := "Scala Exercises: The path to enlightenment",
33-
startYear := Option(2016),
34-
orgGithubSetting := GitHubSettings(
35-
organization = "scala-exercises",
36-
project = name.value,
37-
organizationName = "Scala Exercises",
38-
groupId = "org.scala-exercises",
39-
organizationHomePage = url("https://www.scala-exercises.org"),
40-
organizationEmail = "[email protected]"
41-
),
42-
orgLicenseSetting := ApacheLicense,
43-
scalaVersion := V.scala213,
44-
scalaOrganization := "org.scala-lang",
40+
organization := "org.scala-exercises",
41+
organizationName := "47 Degrees",
42+
organizationHomepage := Some(url("https://47deg.com")),
43+
scalaVersion := autoImport.V.scala,
4544
resolvers ++= Seq(
46-
Resolver.mavenLocal,
4745
Resolver.sonatypeRepo("snapshots"),
4846
Resolver.sonatypeRepo("releases")
49-
),
50-
scalacOptions := sbtorgpolicies.model.scalacCommonOptions,
51-
headerLicense := Some(Custom(s"""| scala-exercises - ${name.value}
52-
| Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
53-
|
54-
|""".stripMargin))
47+
)
5548
)
5649
}

‎project/plugins.sbt

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
resolvers ++= Seq(
2-
Resolver.sonatypeRepo("snapshots")
3-
)
4-
5-
addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.6.0-SNAPSHOT")
6-
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.12.0-M3")
1+
resolvers += Resolver.sonatypeRepo("snapshots")
2+
addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.6.0-SNAPSHOT")
3+
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
4+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
5+
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4")
6+
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
7+
addSbtPlugin("com.alejandrohdezma" %% "sbt-github" % "0.8.0")
8+
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.8.0")
9+
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.8.0")
10+
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.2")

‎pubring.gpg

-18
This file was deleted.

‎secring.gpg.enc

-1.81 KB
Binary file not shown.

0 commit comments

Comments
 (0)