Skip to content
This repository has been archived by the owner on Apr 22, 2020. It is now read-only.

Updates Scalameta Settings #636

Merged
merged 2 commits into from
Sep 19, 2017
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 0 additions & 1 deletion core/src/main/scala/sbtorgpolicies/github/GitHubOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package sbtorgpolicies.github
import java.io.File

import cats.data.{EitherT, NonEmptyList}
import cats.free.Free
import cats.implicits._
import com.github.marklister.base64.Base64._
import github4s.Github
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/sbtorgpolicies/libraries.scala
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ object libraries {
"fs2-cats" -> "0.4.0",
"h2" -> "1.4.196",
"http4s" -> "0.18.0-M1",
"joda-convert" -> "1.8.3",
"joda-convert" -> "1.9",
"joda-time" -> "2.9.9",
"journal" -> "3.0.18",
"jwt-scala" -> "0.14.0",
Expand Down Expand Up @@ -100,7 +100,7 @@ object libraries {
)

val vPlugins47: Map[String, String] = Map[String, String](
"sbt-dependencies" -> "0.2.0",
"sbt-dependencies" -> "0.3.1",
"sbt-microsites" -> "0.7.0"
)

Expand Down
5 changes: 2 additions & 3 deletions project/ProjectPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ object ProjectPlugin extends AutoPlugin {
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1"),
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20"),
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.1"),
addSbtPlugin("com.47deg" % "sbt-dependencies" % "0.2.0"),
addSbtPlugin("com.47deg" % "sbt-dependencies" % "0.3.1"),
// addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10"),
// addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.2.0"),
libraryDependencies ++= {
Expand Down Expand Up @@ -85,8 +85,7 @@ object ProjectPlugin extends AutoPlugin {
"-Dscala.version=" + scalaVersion.value
)
},
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC11"),
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.0")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.0")
)

lazy val coreSettings: Seq[Def.Setting[_]] = commonSettings ++ Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import sbt.Resolver.sonatypeRepo

resolvers ++= Seq(sonatypeRepo("snapshots"), sonatypeRepo("releases"))
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.4")
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.7.2-M1")
1 change: 0 additions & 1 deletion project/project/plugins.sbt

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/scala/sbtorgpolicies/settings/AllSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,9 @@ trait AllSettings

lazy val scalaMetaSettings = Seq(
addCompilerPlugin(%%("scalameta-paradise") cross CrossVersion.full),
libraryDependencies += %%("scalameta"),
scalacOptions += "-Xplugin-require:macroparadise"
libraryDependencies += %%("scalameta", "1.8.0"),
scalacOptions += "-Xplugin-require:macroparadise",
scalacOptions in (Compile, console) ~= (_ filterNot (_ contains "paradise")) // macroparadise plugin doesn't work in repl yet.
)

/**
Expand All @@ -131,7 +132,6 @@ trait AllSettings
lazy val sharedJsSettings = Seq(
scalaJSStage in Global := FastOptStage,
parallelExecution := false,
requiresDOM := false,
jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
// batch mode decreases the amount of memory needed to compile scala.js code
scalaJSOptimizerOptions := scalaJSOptimizerOptions.value.withBatchMode(getEnvVar("TRAVIS").isDefined)
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/sbtorgpolicies/settings/DefaultSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{
HeaderFileType,
HeaderLicense
}
//import dependencies.DependenciesPlugin.autoImport._
import dependencies.DependenciesPlugin.autoImport._
import scoverage.ScoverageKeys
import scoverage.ScoverageKeys.coverageEnabled
import sbtorgpolicies.runnable.SetSetting
Expand Down Expand Up @@ -131,7 +131,7 @@ trait DefaultSettings extends AllSettings {
},
orgAfterCISuccessTaskListSetting := List(
orgUpdateDocFiles.asRunnableItem,
// depUpdateDependencyIssues.asRunnableItem,
depUpdateDependencyIssues.asRunnableItem,
orgPublishReleaseTask.asRunnableItem(allModules = true, aggregated = false, crossScalaVersions = true)
) ++ guard(((baseDirectory in LocalRootProject).value / "docs").exists() && !version.value.endsWith("-SNAPSHOT"))(
defaultPublishMicrosite),
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.7.2-SNAPSHOT"
version in ThisBuild := "0.7.2"