Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build upgrade and Release 0.20.0 #243

Merged
merged 7 commits into from
Dec 27, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@ lazy val docs = (project in file("docs"))
//////////

addCommandAlias("validateDocs", ";project docs;tut;project root")
addCommandAlias(
"validateJVM",
(toCompileTestList(jvmModules) ++ List("project root")).asCmd)
addCommandAlias("validateJVM", (toCompileTestList(jvmModules) ++ List("project root")).asCmd)
addCommandAlias("validateJS", (toCompileTestList(jsModules) ++ List("project root")).asCmd)
addCommandAlias(
"validate",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import github4s.free.domain.{Issue, Label, SearchIssuesResult, User}
import github4s.implicits._
import github4s.utils.BaseIntegrationSpec


trait GHIssuesSpec[T] extends BaseIntegrationSpec[T] {

"Issues >> List" should "return a list of issues" in {
Expand All @@ -36,7 +35,7 @@ trait GHIssuesSpec[T] extends BaseIntegrationSpec[T] {
})
}

"Issues >> Get" should "return an issue which is a PR" in {
"Issues >> Get" should "return an issue which is a PR" ignore {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we create an issue for this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's related to #233

val response = Github(accessToken).issues
.getIssue(validRepoOwner, validRepoName, validPullRequestNumber)
.execFuture[T](headerUserAgent)
Expand Down
50 changes: 34 additions & 16 deletions project/ProjectPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ object ProjectPlugin extends AutoPlugin {

object autoImport {

lazy val V = new {
val base64: String = "0.2.4"
val cats: String = "1.5.0"
val catsEffect: String = "1.1.0"
val circe: String = "0.11.0"
val paradise: String = "2.1.1"
val roshttp: String = "2.2.3"
val simulacrum: String = "0.14.0"
val scalaj: String = "2.4.1"
val scalamockScalatest: String = "3.6.0"
val scalaTest: String = "3.0.5"
val scalaz: String = "7.2.27"

}

lazy val micrositeSettings = Seq(
micrositeName := "Github4s",
micrositeDescription := "Github API wrapper written in Scala",
Expand All @@ -46,40 +61,42 @@ object ProjectPlugin extends AutoPlugin {
)

lazy val commonCrossDeps = Seq(
%%("cats-core"),
%%("cats-free"),
%%("simulacrum"),
%%("circe-core"),
%%("circe-generic"),
%%("circe-parser"),
%%("base64"),
%%("scalamockScalatest") % "test",
%%("scalatest") % "test"
%%("cats-core", V.cats),
%%("cats-free", V.cats),
%%("simulacrum", V.simulacrum),
%%("circe-core", V.circe),
%%("circe-generic", V.circe),
%%("circe-parser", V.circe),
%%("base64", V.base64),
%%("scalamockScalatest", V.scalamockScalatest) % "test",
%%("scalatest", V.scalaTest) % "test"
)

lazy val standardCommonDeps = Seq(
libraryDependencies += compilerPlugin(%%("paradise") cross CrossVersion.full)
libraryDependencies += compilerPlugin(%%("paradise", V.paradise) cross CrossVersion.full)
)

lazy val jvmDeps = Seq(
libraryDependencies ++= Seq(
%%("scalaj"),
%%("scalaj", V.scalaj),
"org.mock-server" % "mockserver-netty" % "3.10.4" % "test" excludeAll ExclusionRule(
"com.twitter")
)
)

lazy val jsDeps: Def.Setting[Seq[ModuleID]] = libraryDependencies += %%%("roshttp")
lazy val jsDeps: Def.Setting[Seq[ModuleID]] = libraryDependencies += %%%("roshttp", V.roshttp)

lazy val docsDependencies: Def.Setting[Seq[ModuleID]] = libraryDependencies += %%("scalatest")
lazy val docsDependencies: Def.Setting[Seq[ModuleID]] = libraryDependencies += %%(
"scalatest",
V.scalaTest)

lazy val scalazDependencies: Def.Setting[Seq[ModuleID]] =
libraryDependencies += %%("scalaz-concurrent")
libraryDependencies += %%("scalaz-concurrent", V.scalaz)

lazy val catsEffectDependencies: Seq[ModuleID] =
Seq(
%%("cats-effect"),
%%("scalatest") % "test"
%%("cats-effect", V.catsEffect),
%%("scalatest", V.scalaTest) % "test"
)

def toCompileTestList(sequence: Seq[ProjectReference]): List[String] = sequence.toList.map {
Expand All @@ -100,6 +117,7 @@ object ProjectPlugin extends AutoPlugin {
crossScalaVersions := scalac.crossScalaVersions,
scalacOptions ~= (_ filterNot Set("-Xlint").contains),
orgGithubTokenSetting := "GITHUB4S_ACCESS_TOKEN",
resolvers += Resolver.bintrayRepo("hmil", "maven"),
orgBadgeListSetting := List(
TravisBadge.apply(_),
GitterBadge.apply(_),
Expand Down
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.16
sbt.version = 1.2.7
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.9.4")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.26")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.19.1-SNAPSHOT"
version in ThisBuild := "0.20.0"