Skip to content

Commit

Permalink
Merge pull request #6 from scala-exercises/removes-sbt-org-policies
Browse files Browse the repository at this point in the history
Updates Project
  • Loading branch information
juanpedromoreno authored Apr 23, 2020
2 parents d5cbccc + 1d7f9e6 commit 271e6f3
Show file tree
Hide file tree
Showing 14 changed files with 146 additions and 45 deletions.
19 changes: 19 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[comment]: <> (Don't edit this file!)
[comment]: <> (It is automatically updated after every release of https://github.com/47degrees/.github)
[comment]: <> (If you want to suggest a change, please open a PR or issue in that repository)

# Authors

## Maintainers

The maintainers of the project are:

- [![juanpedromoreno](https://avatars2.githubusercontent.com/u/4879373?v=4&s=20) **Juan Pedro Moreno (juanpedromoreno)**](https://github.com/juanpedromoreno)
- [![paualarco](https://avatars0.githubusercontent.com/u/33580722?v=4&s=20) **Pau Alarcón (paualarco)**](https://github.com/paualarco)

## Contributors

These are the people that have contributed to the _exercises-pureconfig_ project:

- [![paualarco](https://avatars0.githubusercontent.com/u/33580722?v=4&s=20) **paualarco**](https://github.com/paualarco)
- [![juanpedromoreno](https://avatars2.githubusercontent.com/u/4879373?v=4&s=20) **juanpedromoreno**](https://github.com/juanpedromoreno)
22 changes: 22 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[comment]: <> (Don't edit this file!)
[comment]: <> (It is automatically updated after every release of https://github.com/47degrees/.github)
[comment]: <> (If you want to suggest a change, please open a PR or issue in that repository)

# Code of Conduct

We are committed to providing a friendly, safe and welcoming
environment for all, regardless of level of experience, gender, gender
identity and expression, sexual orientation, disability, personal
appearance, body size, race, ethnicity, age, religion, nationality, or
other such characteristics.

Everyone is expected to follow the
[Scala Code of Conduct](https://typelevel.org/code-of-conduct.html) when
discussing the project on the available communication channels. If you
are being harassed, please contact us immediately so that we can
support you.

## Moderation

For any questions, concerns, or moderation requests please contact a
[member of the project](AUTHORS.md#maintainers).
31 changes: 31 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[comment]: <> (Don't edit this file!)
[comment]: <> (It is automatically updated after every release of https://github.com/47degrees/.github)
[comment]: <> (If you want to suggest a change, please open a PR or issue in that repository)

# Contributing

Discussion around _exercises-pureconfig_ happens in the [GitHub issues](https://github.com/scala-exercises/exercises-pureconfig/issues) and [pull requests](https://github.com/scala-exercises/exercises-pureconfig/pulls).

Feel free to open an issue if you notice a bug, have an idea for a feature, or have a question about
the code. Pull requests are also welcome.

People are expected to follow the [Code of Conduct](CODE_OF_CONDUCT.md) when discussing _exercises-pureconfig_ 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:[email protected]).

## How can I help?

_exercises-pureconfig_ follows a standard [fork and pull](https://help.github.com/articles/using-pull-requests/) model for contributions via GitHub pull requests.

The process is simple:

1. Find something you want to work on
2. Let us know you are working on it via GitHub issues/pull requests
3. Implement your contribution
4. Write tests
5. Update the documentation
6. Submit pull request

You will be automatically included in the [AUTHORS.md](AUTHORS.md#contributors) file as contributor in the next release.

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.
6 changes: 3 additions & 3 deletions LICENSE → LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,15 @@
APPENDIX: How to apply the Apache License to your work.

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

Copyright {yyyy} {name of copyright owner}
Copyright (C) 2020 47 Degrees <https://47deg.com>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -198,4 +198,4 @@
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.
limitations under the License.
9 changes: 9 additions & 0 deletions NOTICE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[comment]: <> (Don't edit this file!)
[comment]: <> (It is automatically updated after every release of https://github.com/47degrees/.github)
[comment]: <> (If you want to suggest a change, please open a PR or issue in that repository)

exercises-pureconfig

Copyright (c) 2020 47 Degrees. All rights reserved.

Licensed under Apache-2.0. See [LICENSE](LICENSE.md) for terms.
36 changes: 6 additions & 30 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,38 +1,14 @@
addCommandAlias("ci-test", "scalafmtCheck; scalafmtSbtCheck; test")
addCommandAlias("ci-docs", "project-docs/mdoc")
addCommandAlias("ci-docs", "github; project-docs/mdoc; headerCreateAll")

val scalaExercisesV = "0.6.0-SNAPSHOT"

def dep(artifactId: String) = "org.scala-exercises" %% artifactId % scalaExercisesV

lazy val template = (project in file("."))
lazy val exercises = (project in file("."))
.enablePlugins(ExerciseCompilerPlugin)
.settings(
organization := "org.scala-exercises",
name := "exercises-pureconfig",
scalaVersion := "2.13.1",
version := "0.0.1",
resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"),
Resolver.sonatypeRepo("releases")
),
libraryDependencies ++= Seq(
dep("exercise-compiler"),
dep("definitions"),
%%("shapeless", "2.3.3"),
%%("scalatest", "3.1.1"),
%%("scalacheck", "1.14.3"),
"com.github.pureconfig" %% "pureconfig" % "0.12.2",
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.4",
"org.scalatestplus" %% "scalatestplus-scalacheck" % "3.1.0.0-RC2"
),
addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.11.0" cross CrossVersion.full)
)
.settings(exercisesSettings)

lazy val `project-docs` = (project in file(".docs"))
.aggregate(template)
.dependsOn(template)
.settings(moduleName := "template-project-docs")
.aggregate(exercises)
.dependsOn(exercises)
.settings(moduleName := "exercises-project-docs")
.settings(mdocIn := file(".docs"))
.settings(mdocOut := file("."))
.settings(skip in publish := true)
Expand Down
41 changes: 41 additions & 0 deletions project/ProjectPlugin.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import sbt.Keys._
import sbt._
import com.alejandrohdezma.sbt.github.SbtGithubPlugin

object ProjectPlugin extends AutoPlugin {

override def trigger: PluginTrigger = allRequirements

override def requires: Plugins = plugins.JvmPlugin && SbtGithubPlugin

object autoImport {

val scalaExercisesV = "0.6.0-SNAPSHOT"

def dep(artifactId: String) = "org.scala-exercises" %% artifactId % scalaExercisesV

lazy val exercisesSettings = Seq(
libraryDependencies ++= Seq(
dep("exercise-compiler"),
dep("definitions"),
"com.chuusai" %% "shapeless" % "2.3.3",
"com.github.pureconfig" %% "pureconfig" % "0.12.2",
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5",
"org.scalatest" %% "scalatest" % "3.1.1",
"org.scalatestplus" %% "scalacheck-1-14" % "3.1.1.1"
)
)
}

override def projectSettings: Seq[Def.Setting[_]] =
Seq(
organization := "org.scala-exercises",
organizationName := "47 Degrees",
organizationHomepage := Some(url("https://47deg.com")),
scalaVersion := "2.13.1",
resolvers ++= Seq(
Resolver.sonatypeRepo("snapshots"),
Resolver.sonatypeRepo("releases")
)
)
}
15 changes: 9 additions & 6 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
resolvers += Resolver.sonatypeRepo("snapshots")
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.13.3")
addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.6.0-SNAPSHOT")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.3")
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.2")
addSbtPlugin("org.scala-exercises" % "sbt-exercise" % "0.6.0-SNAPSHOT")
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")
2 changes: 1 addition & 1 deletion src/main/scala/pureconfiglib/Domain.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2020 47 Degrees <https://47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/pureconfiglib/LoadingConfig.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2020 47 Degrees <https://47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/pureconfiglib/PureConfigLibrary.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2020 47 Degrees <https://47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/pureconfiglib/SupportedTypes.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2020 47 Degrees <https://47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/pureconfiglib/LoadingConfigSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2020 47 Degrees <https://47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/pureconfiglib/TypesSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020 47 Degrees, LLC. <http://www.47deg.com>
* Copyright 2020 47 Degrees <https://47deg.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down

0 comments on commit 271e6f3

Please sign in to comment.