Skip to content

Commit

Permalink
Update dependencies.
Browse files Browse the repository at this point in the history
Change publish repository.
Remove sonatype and gpg plugins as they are no longer needed.
  • Loading branch information
Lasering committed May 25, 2020
1 parent 9639b95 commit 8ced227
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 29 deletions.
14 changes: 4 additions & 10 deletions build.sbt
Expand Up @@ -44,14 +44,12 @@ libraryDependencies ++= Seq("blaze-client", "dsl", "circe").map { module =>
} ++ Seq(
"io.circe" %% "circe-derivation" % "0.13.0-M4",
"io.circe" %% "circe-parser" % "0.13.0",
"com.beachape" %% "enumeratum-circe" % "1.6.0",
"com.beachape" %% "enumeratum-circe" % "1.6.1",
"ch.qos.logback" % "logback-classic" % "1.2.3" % Test,
"org.scalatest" %% "scalatest" % "3.1.1" % Test,
"org.scalatest" %% "scalatest" % "3.1.2" % Test,
)
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1")

//coverageEnabled := true

// ======================================================================================================================
// ==== Testing =========================================================================================================
// ======================================================================================================================
Expand Down Expand Up @@ -115,9 +113,7 @@ envVars in ghpagesPushSite := Map("SBT_GHPAGES_COMMIT_MESSAGE" -> s"Add Scaladoc
// ======================================================================================================================
// ==== Publishing/Release ==============================================================================================
// ======================================================================================================================
publishTo := sonatypePublishTo.value
sonatypeProfileName := organization.value

publishTo := Some("FenixEdu Artifactory" at "https://repo.fenixedu.org/fenixedu-maven-repository/")
licenses += "MIT" -> url("http://opensource.org/licenses/MIT")
homepage := Some(url(s"https://github.com/FenixEdu/${name.value}"))
scmInfo := Some(ScmInfo(homepage.value.get, git.remoteRepo.value))
Expand All @@ -126,12 +122,11 @@ developers ++= List(
)

// Fail the build/release if updates there are updates for the dependencies
//dependencyUpdatesFailBuild := true
dependencyUpdatesFailBuild := true

releaseUseGlobalVersion := false
releaseNextCommitMessage := s"Setting version to ${ReleasePlugin.runtimeVersion.value} [skip ci]"

releasePublishArtifactsAction := PgpKeys.publishSigned.value // Maven Central requires packages to be signed
import ReleaseTransformations._
releaseProcess := Seq[ReleaseStep](
releaseStepTask(dependencyUpdates),
Expand All @@ -144,7 +139,6 @@ releaseProcess := Seq[ReleaseStep](
tagRelease,
releaseStepTask(ghpagesPushSite),
publishArtifacts,
releaseStepCommand("sonatypeRelease"),
pushChanges,
setNextVersion
)
8 changes: 1 addition & 7 deletions project/plugins.sbt
Expand Up @@ -2,10 +2,4 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")

addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
//addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.5.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
13 changes: 1 addition & 12 deletions src/main/scala/org/fenixedu/sdk/services/package.scala
Expand Up @@ -3,7 +3,7 @@ package org.fenixedu.sdk
import cats.Applicative
import cats.effect.Sync
import io.circe.{Decoder, Encoder, Printer}
import org.http4s.{EntityDecoder, EntityEncoder, Uri, circe}
import org.http4s.{EntityDecoder, EntityEncoder, circe}

package object services {
val jsonPrinter: Printer = Printer.noSpaces.copy(dropNullValues = true)
Expand All @@ -13,15 +13,4 @@ package object services {
// Without this decoding to Unit wont work. This makes the EntityDecoder[F, Unit] defined in EntityDecoder companion object
// have a higher priority than the jsonDecoder defined above. https://github.com/http4s/http4s/issues/2806
implicit def void[F[_]: Sync]: EntityDecoder[F, Unit] = EntityDecoder.void

implicit class RichUri(val uri: Uri) extends AnyVal {
def append(pathParts: List[String]): Uri = {
val encoded = pathParts.collect{ case s if s.nonEmpty => Uri.pathEncode(s) }.mkString("/")
val newPath =
if (uri.path.isEmpty || uri.path.last != '/') s"${uri.path}/$encoded"
else s"${uri.path}$encoded"
uri.withPath(newPath)
}
def append(path: Uri.Path): Uri = append(path.split('/').toList)
}
}

0 comments on commit 8ced227

Please sign in to comment.