Skip to content

Commit

Permalink
Release v1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
OlegIlyenko committed Dec 18, 2017
1 parent 7cd9f9a commit b2105f2
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 32 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## v1.1.1 (2017-12-18)

* Updated `circe` to version 0.9.0-M2

## v1.1.0 (2017-05-13)

* Updated `circe` to version 0.8.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
SBT Configuration:

```scala
libraryDependencies += "org.sangria-graphql" %% "sangria-circe" % "1.1.0"
libraryDependencies += "org.sangria-graphql" %% "sangria-circe" % "1.1.1"
```

## License
Expand Down
36 changes: 13 additions & 23 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name := "sangria-circe"
organization := "org.sangria-graphql"
version := "1.2.0-SNAPSHOT"
version := "1.1.1"

description := "Sangria circe marshalling"
homepage := Some(url("http://sangria-graphql.org"))
licenses := Seq("Apache License, ASL Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))

scalaVersion := "2.12.3"
crossScalaVersions := Seq("2.11.11", "2.12.3")
scalaVersion := "2.12.4"
crossScalaVersions := Seq("2.11.11", "2.12.4")

scalacOptions ++= Seq("-deprecation", "-feature")

Expand All @@ -18,20 +18,18 @@ scalacOptions ++= {
Seq("-target:jvm-1.7")
}

val circeVersion = "0.9.0-M1"
val circeVersion = "0.9.0-M2"

libraryDependencies ++= Seq(
"org.sangria-graphql" %% "sangria-marshalling-api" % "1.0.0",

"io.circe" %% "circe-core" % circeVersion,
"io.circe" %% "circe-generic" % circeVersion % Test,

"org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.0" % Test,
"org.scalatest" %% "scalatest" % "3.0.3" % Test
"org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.1" % Test,
"org.scalatest" %% "scalatest" % "3.0.4" % Test
)

git.remoteRepo := "[email protected]:sangria-graphql/sangria-circe.git"

// Publishing

publishMavenStyle := true
Expand All @@ -43,24 +41,16 @@ publishTo := Some(
else
"releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")

// Site and docs

site.settings
site.includeScaladoc()
ghpages.settings

// nice *magenta* prompt!

shellPrompt in ThisBuild := { state =>
scala.Console.MAGENTA + Project.extract(state).currentRef.project + "> " + scala.Console.RESET
}

// Additional meta-info

startYear := Some(2016)
organizationHomepage := Some(url("https://github.com/sangria-graphql"))
developers := Developer("OlegIlyenko", "Oleg Ilyenko", "", url("https://github.com/OlegIlyenko")) :: Nil
scmInfo := Some(ScmInfo(
browseUrl = url("https://github.com/sangria-graphql/sangria-circe.git"),
connection = "scm:git:[email protected]:sangria-graphql/sangria-circe.git"
))
))

// nice *magenta* prompt!

shellPrompt in ThisBuild := { state =>
scala.Console.MAGENTA + Project.extract(state).currentRef.project + "> " + scala.Console.RESET
}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=1.0.3
2 changes: 2 additions & 0 deletions project/coverage.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.2")
7 changes: 0 additions & 7 deletions project/plugins.sbt

This file was deleted.

0 comments on commit b2105f2

Please sign in to comment.