Skip to content

Commit

Permalink
Merge pull request #29 from 47deg/nm-22-licence-copyright
Browse files Browse the repository at this point in the history
Licence and copyright headers
  • Loading branch information
noelmarkham authored Nov 29, 2016
2 parents 4f34bb7 + 5abb46f commit 0507a62
Show file tree
Hide file tree
Showing 14 changed files with 84 additions and 2 deletions.
13 changes: 13 additions & 0 deletions LICENCE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2016 47 Degrees LLC

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

http://www.apache.org/licenses/LICENSE-2.0

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.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ scalacheck-datetime
[![Build Status](https://travis-ci.org/47deg/scalacheck-datetime.svg?branch=master)](https://travis-ci.org/47deg/scalacheck-datetime)
[![codecov.io](http://codecov.io/github/47deg/scalacheck-datetime/coverage.svg?branch=master)](http://codecov.io/github/47deg/scalacheck-datetime?branch=master)

A helper library for using datetime libraries with ScalaCheck
A helper library for using datetime libraries with ScalaCheck

---

This project is licenced under the terms of the [Apache Licence, Version 2.0](LICENCE.txt)
15 changes: 14 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import com.typesafe.sbt.SbtGhPages.ghpages
import com.typesafe.sbt.SbtGit.git
import de.heikoseeberger.sbtheader.HeaderPattern

lazy val buildSettings = Seq(
organization := "com.fortysevendeg",
Expand All @@ -10,7 +11,18 @@ lazy val buildSettings = Seq(
organizationHomepage := Option(url("http://47deg.com")),
scalaVersion := "2.12.0",
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0"),
licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt"))
licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")),
headers := Map(
"scala" -> (
HeaderPattern.cStyleBlockComment,
"""|/*
| * scalacheck-datetime
| * Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
| */
|
|""".stripMargin
)
)
)

lazy val dependencies = libraryDependencies ++= Seq(
Expand All @@ -37,6 +49,7 @@ lazy val root = (project in file("."))
.settings(moduleName := "scalacheck-datetime")
.settings(version := "0.2.1-SNAPSHOT")
.settings(scalacheckDatetimeSettings:_ *)
.enablePlugins(AutomateHeaderPlugin)

lazy val docs = (project in file("docs"))
.settings(moduleName := "scalacheck-datetime-docs")
Expand Down
2 changes: 2 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")

addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.3.3")

addSbtPlugin("de.heikoseeberger" % "sbt-header" % "1.6.0")
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime

import scala.util.Try
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime

trait Granularity[A] {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime.instances

import com.fortysevendeg.scalacheck.datetime.typeclasses._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime.instances

import com.fortysevendeg.scalacheck.datetime.typeclasses._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime

package object instances {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime.jdk8

import collection.JavaConverters._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime.jdk8

import com.fortysevendeg.scalacheck.datetime.Granularity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime.joda

import com.fortysevendeg.scalacheck.datetime.Granularity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime.joda

import com.fortysevendeg.scalacheck.datetime.Granularity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* scalacheck-datetime
* Copyright (C) 2016 47 Degrees, LLC. <http://www.47deg.com>
*/

package com.fortysevendeg.scalacheck.datetime.typeclasses

/*
Expand Down

0 comments on commit 0507a62

Please sign in to comment.