Skip to content
This repository has been archived by the owner on Mar 20, 2018. It is now read-only.

Commit

Permalink
Upgrades to freestyle 0.4.0. (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
juanpedromoreno committed Oct 17, 2017
1 parent f9f02a6 commit 0352a00
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ before_cache:
cache:
directories:
- $HOME/.sbt/cache
- $HOME/.sbt/0.13
- $HOME/.sbt/1.0
- $HOME/.sbt/boot/
- $HOME/.sbt/boot/scala*
- $HOME/.sbt/launchers
Expand Down
30 changes: 18 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,35 @@ lazy val root = project
lazy val plugin = project
.in(file("plugin"))
.dependsOn(core)
.enablePlugins(BuildInfoPlugin)
.settings(
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
buildInfoPackage := "freestyle.rpc.protocol"
)
.settings(moduleName := "sbt-frees-protogen")
.settings(sbtPlugin := true)
.settings(scalacOptions := Seq("-deprecation", "-encoding", "UTF-8", "-feature", "-unchecked"))
.settings(
orgBadgeListSetting := List(
TravisBadge.apply,
CodecovBadge.apply,
ScalaLangBadge.apply,
LicenseBadge.apply,
// Gitter badge (owner field) can be configured with default value if we migrate it to the frees-io organization
{ info => GitterBadge.apply(info.copy(owner = "47deg", repo = "freestyle")) },
GitHubIssuesBadge.apply
))
.settings(orgBadgeListSetting := List(
TravisBadge.apply,
CodecovBadge.apply,
ScalaLangBadge.apply,
LicenseBadge.apply,
// Gitter badge (owner field) can be configured with default value if we migrate it to the frees-io organization
{ info =>
GitterBadge.apply(info.copy(owner = "47deg", repo = "freestyle"))
},
GitHubIssuesBadge.apply
))

lazy val core = project
.in(file("core"))
.settings(moduleName := "frees-protogen-core")
.settings(scalaMetaSettings: _*)
.settings(
libraryDependencies ++= Seq(
"io.frees" %% "frees-rpc-common" % "0.0.7",
"io.frees" %% "frees-rpc-common" % "0.0.8",
%%("cats-core"),
%%("scalameta-contrib", "1.8.0"),
%%("simulacrum")
)
)
)
6 changes: 5 additions & 1 deletion plugin/src/main/scala/ProtoGenPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package freestyle

import freestyle.rpc.protocol._
import sbt._
import sbt.Keys._

Expand Down Expand Up @@ -61,5 +62,8 @@ object ProtoGenPlugin extends AutoPlugin {
}
)

override def projectSettings: Seq[Def.Setting[_]] = defaultSettings ++ protoGenTaskSettings
override def projectSettings: Seq[Def.Setting[_]] =
defaultSettings ++ protoGenTaskSettings ++ Seq(
libraryDependencies += "io.frees" %% "frees-protogen-core" % BuildInfo.version
)
}
1 change: 1 addition & 0 deletions project/buildinfo.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
3 changes: 2 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
addSbtPlugin("io.frees" % "sbt-freestyle" % "0.2.5")
resolvers += Resolver.sonatypeRepo("releases")
addSbtPlugin("io.frees" % "sbt-freestyle" % "0.3.2")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.0.10-SNAPSHOT"
version in ThisBuild := "0.0.10"

0 comments on commit 0352a00

Please sign in to comment.