Skip to content

Commit 4511dec

Browse files
juanpedromorenojuanpedromoreno
authored
Removes sbt-org-policies (#107)
1 parent b1cb028 commit 4511dec

19 files changed

+253
-125
lines changed

Diff for: ‎AUTHORS.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[comment]: <> (Don't edit this file!)
2+
[comment]: <> (It is automatically updated after every release of https://github.com/47degrees/.github)
3+
[comment]: <> (If you want to suggest a change, please open a PR or issue in that repository)
4+
5+
# Authors
6+
7+
## Maintainers
8+
9+
The maintainers of the project are:
10+
11+
- [![47erbot](https://avatars1.githubusercontent.com/u/24799081?v=4&s=20) **47erbot**](https://github.com/47erbot)
12+
- [![angoglez](https://avatars0.githubusercontent.com/u/10107285?v=4&s=20) **Ana Gómez González (angoglez)**](https://github.com/angoglez)
13+
- [![andyscott](https://avatars3.githubusercontent.com/u/310363?v=4&s=20) **Andy Scott (andyscott)**](https://github.com/andyscott)
14+
- [![dominv](https://avatars1.githubusercontent.com/u/3943031?v=4&s=20) **Domingo Valera (dominv)**](https://github.com/dominv)
15+
- [![kiroco12](https://avatars1.githubusercontent.com/u/48894338?v=4&s=20) **Enrique Nieto (kiroco12)**](https://github.com/kiroco12)
16+
- [![jdesiloniz](https://avatars2.githubusercontent.com/u/2835739?v=4&s=20) **Javier de Silóniz Sandino (jdesiloniz)**](https://github.com/jdesiloniz)
17+
- [![juanpedromoreno](https://avatars2.githubusercontent.com/u/4879373?v=4&s=20) **Juan Pedro Moreno (juanpedromoreno)**](https://github.com/juanpedromoreno)
18+
- [![raulraja](https://avatars3.githubusercontent.com/u/456796?v=4&s=20) **Raúl Raja Martínez (raulraja)**](https://github.com/raulraja)
19+
20+
## Contributors
21+
22+
These are the people that have contributed to the _evaluator_ project:
23+
24+
- [![juanpedromoreno](https://avatars2.githubusercontent.com/u/4879373?v=4&s=20) **juanpedromoreno**](https://github.com/juanpedromoreno)
25+
- [![kiroco12](https://avatars1.githubusercontent.com/u/48894338?v=4&s=20) **kiroco12**](https://github.com/kiroco12)
26+
- [![raulraja](https://avatars3.githubusercontent.com/u/456796?v=4&s=20) **raulraja**](https://github.com/raulraja)
27+
- [![noelmarkham](https://avatars1.githubusercontent.com/u/1492487?v=4&s=20) **noelmarkham**](https://github.com/noelmarkham)
28+
- [![dominv](https://avatars1.githubusercontent.com/u/3943031?v=4&s=20) **dominv**](https://github.com/dominv)
29+
- [![jdesiloniz](https://avatars2.githubusercontent.com/u/2835739?v=4&s=20) **jdesiloniz**](https://github.com/jdesiloniz)
30+
- [![andyscott](https://avatars3.githubusercontent.com/u/310363?v=4&s=20) **andyscott**](https://github.com/andyscott)
31+
- [![angoglez](https://avatars0.githubusercontent.com/u/10107285?v=4&s=20) **angoglez**](https://github.com/angoglez)
32+
- [![47erbot](https://avatars1.githubusercontent.com/u/24799081?v=4&s=20) **47erbot**](https://github.com/47erbot)

Diff for: ‎CODE_OF_CONDUCT.md

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[comment]: <> (Don't edit this file!)
2+
[comment]: <> (It is automatically updated after every release of https://github.com/47degrees/.github)
3+
[comment]: <> (If you want to suggest a change, please open a PR or issue in that repository)
4+
5+
# Code of Conduct
6+
7+
We are committed to providing a friendly, safe and welcoming
8+
environment for all, regardless of level of experience, gender, gender
9+
identity and expression, sexual orientation, disability, personal
10+
appearance, body size, race, ethnicity, age, religion, nationality, or
11+
other such characteristics.
12+
13+
Everyone is expected to follow the
14+
[Scala Code of Conduct](https://typelevel.org/code-of-conduct.html) when
15+
discussing the project on the available communication channels. If you
16+
are being harassed, please contact us immediately so that we can
17+
support you.
18+
19+
## Moderation
20+
21+
For any questions, concerns, or moderation requests please contact a
22+
[member of the project](AUTHORS.md#maintainers).

Diff for: ‎CONTRIBUTING.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[comment]: <> (Don't edit this file!)
2+
[comment]: <> (It is automatically updated after every release of https://github.com/47degrees/.github)
3+
[comment]: <> (If you want to suggest a change, please open a PR or issue in that repository)
4+
5+
# Contributing
6+
7+
Discussion around _evaluator_ happens in the [GitHub issues](https://github.com/scala-exercises/evaluator/issues) and [pull requests](https://github.com/scala-exercises/evaluator/pulls).
8+
9+
Feel free to open an issue if you notice a bug, have an idea for a feature, or have a question about
10+
the code. Pull requests are also welcome.
11+
12+
People are expected to follow the [Code of Conduct](CODE_OF_CONDUCT.md) when discussing _evaluator_ on the Github page or other venues.
13+
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:[email protected]).
15+
16+
## How can I help?
17+
18+
_evaluator_ follows a standard [fork and pull](https://help.github.com/articles/using-pull-requests/) model for contributions via GitHub pull requests.
19+
20+
The process is simple:
21+
22+
1. Find something you want to work on
23+
2. Let us know you are working on it via GitHub issues/pull requests
24+
3. Implement your contribution
25+
4. Write tests
26+
5. Update the documentation
27+
6. Submit pull request
28+
29+
You will be automatically included in the [AUTHORS.md](AUTHORS.md#contributors) file as contributor in the next release.
30+
31+
If you encounter any confusion or frustration during the contribution process, please create a GitHub issue and we'll do our best to improve the process.

Diff for: ‎LICENSE renamed to ‎LICENSE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,15 @@
178178
APPENDIX: How to apply the Apache License to your work.
179179

180180
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "{}"
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182182
replaced with your own identifying information. (Don't include
183183
the brackets!) The text should be enclosed in the appropriate
184184
comment syntax for the file format. We also recommend that a
185185
file or class name and description of purpose be included on the
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright {yyyy} {name of copyright owner}
189+
Copyright (C) 2016-2020 47 Degrees <https://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.
@@ -198,4 +198,4 @@
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.

Diff for: ‎NOTICE.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[comment]: <> (Don't edit this file!)
2+
[comment]: <> (It is automatically updated after every release of https://github.com/47degrees/.github)
3+
[comment]: <> (If you want to suggest a change, please open a PR or issue in that repository)
4+
5+
evaluator
6+
7+
Copyright (c) 2016-2020 47 Degrees. All rights reserved.
8+
9+
Licensed under Apache-2.0. See [LICENSE](LICENSE.md) for terms.

Diff for: ‎README.md

+10-25
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
[![Build Status](https://travis-ci.org/scala-exercises/evaluator.svg?branch=master)](https://travis-ci.org/scala-exercises/evaluator)
2-
31
# Remote Scala Eval
42

53
The remote Scala evaluator is a server based application that
@@ -14,14 +12,14 @@ sbt "project evaluator-server" "run"
1412
# Authentication
1513

1614
The remote Scala eval uses [JWT](https://jwt.io/) to encode / decode tokens.
17-
The `secretKey` used for encoding/decoding is configurable as part of the service configuration in
15+
The `secretKey` used for encoding/decoding is configurable as part of the service configuration in
1816
`server/src/main/resources/application.conf`.
1917

2018
Please change `secretKey` by overriding it or providing the `EVAL_SECRET_KEY` env var.
2119

2220
```
2321
eval.auth {
24-
secretKey = "secretKey"
22+
secretKey = "secretKey"
2523
secretKey = ${?EVAL_SECRET_KEY}
2624
}
2725
```
@@ -52,12 +50,12 @@ Requests are sent in JSON format via HTTP POST and are authenticated via the `x-
5250
Given the token above a sample request may look like:
5351

5452
```bash
55-
curl -X POST -H "Content-Type: application/json" -H "x-scala-eval-api-token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eW91ciBpZGVudGl0eQ.cfH43Wa7k_w1i0W2pQhV1k21t2JqER9lw5EpJcENRMI" -d '{
56-
"resolvers":[
53+
curl -X POST -H "Content-Type: application/json" -H "x-scala-eval-api-token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eW91ciBpZGVudGl0eQ.cfH43Wa7k_w1i0W2pQhV1k21t2JqER9lw5EpJcENRMI" -d '{
54+
"resolvers":[
5755
"https://oss.sonatype.org/content/repositories/releases"
5856
],
59-
"dependencies":[
60-
{
57+
"dependencies":[
58+
{
6159
"groupId":"org.typelevel",
6260
"artifactId":"cats-core_2.11",
6361
"version":"0.4.1"
@@ -78,12 +76,12 @@ x-scala-eval-api-token : eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eW91ciBpZGVudGl0eQ
7876
## Body
7977

8078
```json
81-
{
82-
"resolvers":[
79+
{
80+
"resolvers":[
8381
"https://oss.sonatype.org/content/repositories/releases"
8482
],
85-
"dependencies":[
86-
{
83+
"dependencies":[
84+
{
8785
"groupId":"org.typelevel",
8886
"artifactId":"cats-core_2.11",
8987
"version":"0.4.1"
@@ -151,16 +149,3 @@ Evaluating code that may result in a thrown exception
151149
"compilationInfos": {}
152150
}
153151
```
154-
155-
156-
# License
157-
158-
Copyright (C) 2015-2016 47 Degrees, LLC. Reactive, scalable software solutions. http://47deg.com [email protected]
159-
160-
Some parts of the code have been taken from twitter-eval, and slightly adapted to the evaluator needs. Copyright 2010 Twitter, Inc.
161-
162-
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
163-
164-
http://www.apache.org/licenses/LICENSE-2.0
165-
166-
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

Diff for: ‎build.sbt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
addCommandAlias("ci-test", "scalafmtCheck; scalafmtSbtCheck; test")
2-
addCommandAlias("ci-docs", "project-docs/mdoc")
1+
addCommandAlias("ci-test", "github; scalafmtCheck; scalafmtSbtCheck; test")
2+
addCommandAlias("ci-docs", "github; project-docs/mdoc; headerCreateAll")
33

44
Universal / javaOptions += "-Dscala.classpath.closeZip=true"
55

@@ -8,7 +8,7 @@ lazy val `evaluator-server` = (project in file("server"))
88
.enablePlugins(AutomateHeaderPlugin)
99
.enablePlugins(sbtdocker.DockerPlugin)
1010
.enablePlugins(BuildInfoPlugin)
11-
.settings(noPublishSettings: _*)
11+
.settings(skip in publish := true)
1212
.settings(
1313
name := "evaluator-server",
1414
serverHttpDependencies,
@@ -21,17 +21,17 @@ lazy val `evaluator-server` = (project in file("server"))
2121
lazy val smoketests = (project in file("smoketests"))
2222
.dependsOn(`evaluator-server`)
2323
.enablePlugins(BuildInfoPlugin)
24-
.settings(noPublishSettings: _*)
24+
.settings(skip in publish := true)
2525
.settings(
2626
name := "evaluator-server-smoke-tests",
27-
smoketestDependencies
27+
serverHttpDependencies
2828
)
2929
.settings(buildInfoSettings: _*)
3030

3131
lazy val root = (project in file("."))
3232
.settings(mainClass in Universal := Some("org.scalaexercises.evaluator.EvaluatorServer"))
3333
.settings(stage := (stage in Universal in `evaluator-server`).value)
34-
.settings(noPublishSettings: _*)
34+
.settings(skip in publish := true)
3535
.aggregate(`evaluator-server`)
3636
.dependsOn(`evaluator-server`)
3737

Diff for: ‎keys.tar.gz.gpg

-3.31 KB
Binary file not shown.

Diff for: ‎project/ProjectPlugin.scala

+35-69
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
import de.heikoseeberger.sbtheader.HeaderPlugin
22
import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport._
33
import sbt.Keys._
4-
import sbt.{Def, _}
4+
import sbt._
55
import sbtassembly.AssemblyPlugin.autoImport.assembly
66
import sbtbuildinfo.BuildInfoKey
77
import sbtbuildinfo.BuildInfoPlugin.autoImport._
88
import sbtdocker.DockerPlugin.autoImport._
9-
import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
10-
import sbtorgpolicies._
11-
import sbtorgpolicies.model._
9+
import com.alejandrohdezma.sbt.github.SbtGithubPlugin
1210

1311
object ProjectPlugin extends AutoPlugin {
1412

1513
override def trigger: PluginTrigger = allRequirements
1614

17-
override def requires: Plugins = plugins.JvmPlugin && HeaderPlugin && OrgPoliciesPlugin
15+
override def requires: Plugins = plugins.JvmPlugin && SbtGithubPlugin
1816

1917
object autoImport {
2018

2119
object V {
2220
lazy val cats = "2.1.0"
23-
lazy val http4s = "0.21.0-M6"
24-
lazy val circe = "0.12.3"
21+
lazy val catsEffect = "2.1.3"
22+
lazy val http4s = "0.21.3"
23+
lazy val circe = "0.13.0"
2524
lazy val log4s = "1.7.0"
2625
lazy val scalatest = "3.1.1"
27-
lazy val scalatestplusScheck = "3.1.0.0-RC2"
26+
lazy val scalatestplusScheck = "3.1.1.1"
2827
lazy val jodaTime = "2.10.5"
29-
lazy val slf4jSimple = "1.7.30"
28+
lazy val slf4j = "1.7.30"
3029
lazy val jwtCore = "4.3.0"
31-
lazy val coursier = "2.0.0-RC5-6"
30+
lazy val coursier = "2.0.0-RC6-12"
3231
lazy val config = "1.4.0"
32+
lazy val scala = "2.13.1"
3333
}
3434

3535
lazy val dockerSettings = Seq(
@@ -66,22 +66,22 @@ object ProjectPlugin extends AutoPlugin {
6666

6767
lazy val serverHttpDependencies = Seq(
6868
libraryDependencies ++= Seq(
69-
%%("cats-core", V.cats),
70-
%%("cats-effect", V.cats),
71-
%%("circe-core", V.circe),
72-
%%("circe-generic", V.circe),
73-
%("slf4j-simple", V.slf4jSimple),
74-
%%("http4s-dsl", V.http4s),
75-
%%("http4s-blaze-server", V.http4s),
76-
%%("http4s-circe", V.http4s),
77-
%("config", V.config),
78-
%%("jwt-core", V.jwtCore),
79-
%%("coursier", V.coursier),
80-
%%("coursier-cache", V.coursier),
81-
"io.get-coursier" %% "coursier-cats-interop" % V.coursier,
82-
%%("scalatest", V.scalatest),
83-
"org.scalatestplus" %% "scalatestplus-scalacheck" % V.scalatestplusScheck,
84-
"joda-time" % "joda-time" % V.jodaTime
69+
"org.typelevel" %% "cats-core" % V.cats,
70+
"org.typelevel" %% "cats-effect" % V.catsEffect,
71+
"io.circe" %% "circe-core" % V.circe,
72+
"io.circe" %% "circe-generic" % V.circe,
73+
"org.slf4j" % "slf4j-simple" % V.slf4j,
74+
"org.http4s" %% "http4s-dsl" % V.http4s,
75+
"org.http4s" %% "http4s-blaze-server" % V.http4s,
76+
"org.http4s" %% "http4s-circe" % V.http4s,
77+
"io.get-coursier" %% "coursier" % V.coursier,
78+
"io.get-coursier" %% "coursier-cache" % V.coursier,
79+
"com.typesafe" % "config" % V.config,
80+
"com.pauldijou" %% "jwt-core" % V.jwtCore,
81+
"io.get-coursier" %% "coursier-cats-interop" % V.coursier,
82+
"org.scalatest" %% "scalatest" % V.scalatest,
83+
"org.scalatestplus" %% "scalacheck-1-14" % V.scalatestplusScheck,
84+
"joda-time" % "joda-time" % V.jodaTime
8585
)
8686
)
8787

@@ -90,57 +90,23 @@ object ProjectPlugin extends AutoPlugin {
9090
buildInfoPackage := "org.scalaexercises.evaluator"
9191
)
9292

93-
lazy val smoketestDependencies = Seq(
94-
libraryDependencies ++= Seq(
95-
%%("cats-core", V.cats),
96-
%%("cats-effect", V.cats),
97-
%%("circe-core", V.circe),
98-
%%("circe-generic", V.circe),
99-
%%("circe-parser", V.circe),
100-
%%("http4s-blaze-client", V.http4s),
101-
%%("http4s-circe", V.http4s),
102-
%%("jwt-core", V.jwtCore),
103-
%%("scalatest", V.scalatest) % Test,
104-
"org.scalatestplus" %% "scalatestplus-scalacheck" % V.scalatestplusScheck % Test
105-
)
106-
)
107-
10893
}
10994

95+
import autoImport._
96+
11097
override def projectSettings: Seq[Def.Setting[_]] =
11198
Seq(
11299
name := "evaluator",
113100
description := "Scala Exercises: The path to enlightenment",
114-
startYear := Option(2016),
115-
resolvers ++= Seq(
116-
Resolver.mavenLocal,
117-
Resolver.sonatypeRepo("snapshots"),
118-
Resolver.sonatypeRepo("releases")
119-
),
120-
orgGithubSetting := GitHubSettings(
121-
organization = "scala-exercises",
122-
project = name.value,
123-
organizationName = "Scala Exercises",
124-
groupId = "org.scala-exercises",
125-
organizationHomePage = url("https://www.scala-exercises.org"),
126-
organizationEmail = "[email protected]"
127-
),
128-
orgLicenseSetting := ApacheLicense,
129-
scalaVersion := "2.13.1",
130-
scalaOrganization := "org.scala-lang",
101+
organization := "org.scala-exercises",
102+
organizationName := "47 Degrees",
103+
organizationHomepage := Some(url("https://47deg.com")),
104+
scalaVersion := V.scala,
105+
crossScalaVersions := Seq(V.scala),
131106
scalacOptions ~= (_ filterNot (_ == "-Xfuture")),
132107
scalacOptions += "-Ymacro-annotations",
133108
javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options"),
134109
parallelExecution in Test := false,
135-
cancelable in Global := true,
136-
headerLicense := Some(
137-
HeaderLicense.Custom(
138-
s"""|
139-
| scala-exercises - ${name.value}
140-
| Copyright (C) 2015-2019 47 Degrees, LLC. <http://www.47deg.com>
141-
|
142-
|""".stripMargin
143-
)
144-
)
145-
) ++ shellPromptSettings
110+
cancelable in Global := true
111+
)
146112
}

0 commit comments

Comments
 (0)