Skip to content

Commit

Permalink
added gitignore and kitten dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
kailuowang committed Jan 18, 2016
1 parent d4e3a23 commit 323580d
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 13 deletions.
21 changes: 21 additions & 0 deletions .gitignore
@@ -0,0 +1,21 @@
.idea
### Scala template
*.class
*.log

# sbt specific
.cache
.history
.lib/
dist/*
target/
lib_managed/
src_managed/
project/boot/
project/plugins/project/

# Scala-IDE specific
.scala_dependencies
.worksheet

# Created by .ignore support plugin (hsz.mobi)
9 changes: 9 additions & 0 deletions core/src/main/scala/henkan/reader.scala
@@ -0,0 +1,9 @@
package henkan

trait Reader[S, F[_], T] {
def read(source: S): F[T]
}

trait FieldReader[S, F[_], T] {
def read(source: S, fieldName: String): F[T]
}
1 change: 0 additions & 1 deletion core/src/main/scala/henkan/stub.scala

This file was deleted.

20 changes: 12 additions & 8 deletions project/Dependencies.scala
Expand Up @@ -6,30 +6,34 @@ object Dependencies {
val specs2 = "3.6.6"
}

val shapeless = Seq("com.chuusai" %% "shapeless" % "2.2.5")
val shapeless = Seq("com.chuusai" %% "shapeless" % "2.3.0-SNAPSHOT")

val cat = Seq("org.spire-math" %% "cats" % "0.3.0")

val kittens = Seq("com.milessabin" %% "kittens" % "1.0.0-SNAPSHOT")

val test = Seq(
"org.specs2" %% "specs2-core" % Versions.specs2 % "test",
"org.specs2" %% "specs2-mock" % Versions.specs2 % "test"
)

val commonSettings = Seq(
scalaVersion in ThisBuild := "2.11.7",
resolvers ++= Seq(
Resolver.sonatypeRepo("releases"),
Resolver.sonatypeRepo("snapshots"),
"bintray/non" at "http://dl.bintray.com/non/maven",
Resolver.bintrayRepo("scalaz", "releases")
),
libraryDependencies ++= kittens,

addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.7.1")
)

val testSettings = commonSettings ++ Seq(
libraryDependencies ++= test
)

val settings = commonSettings ++ Seq(
resolvers ++= Seq(
Resolver.sonatypeRepo("releases"),
Resolver.sonatypeRepo("snapshots"),
Resolver.bintrayRepo("scalaz", "releases")
)
)
val settings = commonSettings

}
7 changes: 4 additions & 3 deletions project/Projects.scala
Expand Up @@ -2,9 +2,10 @@ import sbt._
import Keys._

object Projects extends Build {

lazy val henkan = project.in(file("."))
.settings(moduleName := "root")
.aggregate(core, test)
.aggregate(core, tests)
.settings(Common.settings:_*)
.settings(Common.noPublishing: _*)

Expand All @@ -15,7 +16,7 @@ object Projects extends Build {
.settings(Publish.settings:_*)
.settings(Format.settings:_*)

lazy val test = project.in(file("test"))
lazy val tests = project.in(file("tests"))
.dependsOn(core)
.aggregate(core)
.settings(moduleName := "henkan-tests")
Expand All @@ -25,7 +26,7 @@ object Projects extends Build {
.settings(Format.settings:_*)
.settings(Testing.settings:_*)

lazy val examples = project.in(file("example"))
lazy val examples = project.in(file("examples"))
.dependsOn(core)
.aggregate(core)
.settings(moduleName := "henkan-examples")
Expand Down
3 changes: 2 additions & 1 deletion project/plugins.sbt
@@ -1,4 +1,5 @@
resolvers += "Sonatype OSS Releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"
resolvers ++= Seq("Sonatype OSS Releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2",
"Typesafe Repository" at "https://repo.typesafe.com/typesafe/releases/")

addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")

Expand Down

0 comments on commit 323580d

Please sign in to comment.