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

Bumps sbt-org-policies version in order to fix scripted issues #224

Merged
merged 2 commits into from
Sep 18, 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
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: scala

jdk:
- oraclejdk8

matrix:
include:
- scala: 2.12.3
jdk: oraclejdk8
env:
- SBT_VERSION=1.0.1
# TODO test sbt 0.13.16/(2.12.3) vs 0.13.16(2.10.6) in matrix
- scala: 2.12.3
jdk: oraclejdk8
- scala: 2.10.6
env:
- SBT_VERSION=0.13.16

Expand All @@ -25,10 +25,8 @@ install:
- gem install jekyll -v 3.2.1

script:
- sbt ^^$SBT_VERSION clean compile test
- if [ "$TRAVIS_BRANCH" = "master" ]; then
sbt ^^$SBT_VERSION scripted;
fi
- sbt ++$TRAVIS_SCALA_VERSION ^^$SBT_VERSION clean compile test
- sbt ++$TRAVIS_SCALA_VERSION ^^$SBT_VERSION scripted;

after_success:
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
Expand Down
5 changes: 4 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ lazy val docs = (project in file("docs"))
.settings(moduleName := "docs")
// .settings(micrositeSettings: _*)
.settings(noPublishSettings: _*)
.settings(buildInfoSettings: _*)
.settings(Seq(
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
buildInfoPackage := "microsites"
): _*)
// .enablePlugins(MicrositesPlugin)
.enablePlugins(TutPlugin)
.enablePlugins(BuildInfoPlugin)
Expand Down
8 changes: 1 addition & 7 deletions project/ProjectPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
import sbt.Keys._
import sbt.ScriptedPlugin.autoImport._
import sbt._
import sbtbuildinfo.BuildInfoPlugin.autoImport._
import sbtorgpolicies.model.{sbtV, scalac}
import sbtorgpolicies.OrgPoliciesPlugin
import sbtorgpolicies.OrgPoliciesPlugin.autoImport._
Expand All @@ -28,7 +27,7 @@ object ProjectPlugin extends AutoPlugin {
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2"),
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0"),
libraryDependencies ++= Seq(
"com.47deg" %% "org-policies-core" % "0.6.2",
"com.47deg" %% "org-policies-core" % "0.6.4",
%%("moultingyaml"),
%%("scalatags"),
%%("scalactic"),
Expand Down Expand Up @@ -70,11 +69,6 @@ object ProjectPlugin extends AutoPlugin {
}
)

lazy val buildInfoSettings = Seq(
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
buildInfoPackage := "microsites"
)

// lazy val micrositeSettings = Seq(
// micrositeName := "sbt-microsites",
// micrositeDescription := "An sbt plugin to create awesome microsites for your project",
Expand Down
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")
5 changes: 4 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.2")
import sbt.Resolver.sonatypeRepo

resolvers ++= Seq(sonatypeRepo("snapshots"), sonatypeRepo("releases"))
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.4")

libraryDependencies += {
lazy val sbtVersionValue = (sbtVersion in pluginCrossBuild).value
Expand Down