From b642fc16294864eff9ee86dde83957d555f0faf6 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Fri, 15 Sep 2017 19:43:00 +0200 Subject: [PATCH 1/4] Tries to fix scripted tests isolating them --- .travis.yml | 13 +++--- build.sbt | 4 +- project/ProjectPlugin.scala | 17 +------- project/build.properties | 2 +- project/plugins.sbt | 9 +--- src/sbt-test/microsites/basic/build.sbt | 2 - .../microsites/change-default-paths/build.sbt | 16 ------- .../microsites/microsites-config-keys/test | 23 ---------- .../microsites/microsites-tasks/build.sbt | 2 - src/sbt-test/microsites/microsites-tasks/test | 27 ------------ src/sbt-test/microsites/scala-2-12/build.sbt | 11 ----- src/sbt-test/microsites/tut-compile/build.sbt | 11 ----- tests/build.sbt | 13 ++++++ tests/src/sbt-test/microsites/basic/build.sbt | 12 ++++++ .../microsites/basic/project/plugins.sbt | 0 .../src}/sbt-test/microsites/basic/test | 3 +- .../microsites/change-default-paths/README.md | 0 .../microsites/change-default-paths/build.sbt | 38 +++++++++++++++++ .../change-default-paths/project/plugins.sbt | 0 .../src/main/resources/images/sbt.png | 0 .../src/main/resources/images/scala.png | Bin .../src/main/resources/styles/override-1.css | 0 .../src/main/resources/styles/override-2.css | 0 .../change-default-paths/src/main/tut/docs.md | 0 .../microsites/change-default-paths/test | 8 +--- .../microsites/config-hosting/README.md | 0 .../microsites/config-hosting/build.sbt | 8 +++- .../config-hosting/project/plugins.sbt | 0 .../sbt-test/microsites/config-hosting/test | 5 --- .../microsites/config-yml/CONSEQUAT.md | 0 .../sbt-test/microsites/config-yml/README.md | 0 .../sbt-test/microsites/config-yml/build.sbt | 8 +++- .../microsites/config-yml/project/plugins.sbt | 0 .../src/main/resources/myconfig.yml | 0 .../src}/sbt-test/microsites/config-yml/test | 5 --- .../microsites/extra-md-files/CONSEQUAT.md | 0 .../microsites/extra-md-files/README.md | 0 .../microsites/extra-md-files/build.sbt | 12 +++++- .../extra-md-files/project/plugins.sbt | 0 .../sbt-test/microsites/extra-md-files/test | 3 +- .../microsites-config-keys/README.md | 0 .../microsites-config-keys/build.sbt | 19 ++++++++- .../project/plugins.sbt | 0 .../resources/microsite/css/override-1.css | 0 .../resources/microsite/css/override-2.css | 0 .../src/main/resources/microsite/img/sbt.png | 0 .../main/resources/microsite/img/scala.png | Bin .../src/main/tut/docs.md | 0 .../microsites/microsites-config-keys/test | 14 ++++++ .../microsites/microsites-tasks/build.sbt | 40 ++++++++++++++++++ .../microsites-tasks/project/plugins.sbt | 0 .../sbt-test/microsites/microsites-tasks/test | 17 ++++++++ .../sbt-test/microsites/scala-2-12/README.md | 0 .../sbt-test/microsites/scala-2-12/build.sbt | 32 ++++++++++++++ .../microsites/scala-2-12/project/plugins.sbt | 0 .../scala-2-12/src/main/tut/docs.md | 0 .../src/sbt-test/microsites/scala-2-12}/test | 6 +-- .../sbt-test/microsites/tut-compile/README.md | 0 .../sbt-test/microsites/tut-compile/build.sbt | 32 ++++++++++++++ .../tut-compile/project/plugins.sbt | 0 .../tut-compile/src/main/tut/docs.md | 0 .../src/sbt-test/microsites/tut-compile}/test | 6 +-- 62 files changed, 259 insertions(+), 159 deletions(-) delete mode 100644 src/sbt-test/microsites/basic/build.sbt delete mode 100644 src/sbt-test/microsites/change-default-paths/build.sbt delete mode 100644 src/sbt-test/microsites/microsites-config-keys/test delete mode 100644 src/sbt-test/microsites/microsites-tasks/build.sbt delete mode 100644 src/sbt-test/microsites/microsites-tasks/test delete mode 100644 src/sbt-test/microsites/scala-2-12/build.sbt delete mode 100644 src/sbt-test/microsites/tut-compile/build.sbt create mode 100644 tests/build.sbt create mode 100644 tests/src/sbt-test/microsites/basic/build.sbt rename {src => tests/src}/sbt-test/microsites/basic/project/plugins.sbt (100%) rename {src => tests/src}/sbt-test/microsites/basic/test (59%) rename {src => tests/src}/sbt-test/microsites/change-default-paths/README.md (100%) create mode 100644 tests/src/sbt-test/microsites/change-default-paths/build.sbt rename {src => tests/src}/sbt-test/microsites/change-default-paths/project/plugins.sbt (100%) rename {src => tests/src}/sbt-test/microsites/change-default-paths/src/main/resources/images/sbt.png (100%) rename {src => tests/src}/sbt-test/microsites/change-default-paths/src/main/resources/images/scala.png (100%) rename {src => tests/src}/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-1.css (100%) rename {src => tests/src}/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-2.css (100%) rename {src => tests/src}/sbt-test/microsites/change-default-paths/src/main/tut/docs.md (100%) rename {src => tests/src}/sbt-test/microsites/change-default-paths/test (53%) rename {src => tests/src}/sbt-test/microsites/config-hosting/README.md (100%) rename {src => tests/src}/sbt-test/microsites/config-hosting/build.sbt (76%) rename {src => tests/src}/sbt-test/microsites/config-hosting/project/plugins.sbt (100%) rename {src => tests/src}/sbt-test/microsites/config-hosting/test (57%) rename {src => tests/src}/sbt-test/microsites/config-yml/CONSEQUAT.md (100%) rename {src => tests/src}/sbt-test/microsites/config-yml/README.md (100%) rename {src => tests/src}/sbt-test/microsites/config-yml/build.sbt (77%) rename {src => tests/src}/sbt-test/microsites/config-yml/project/plugins.sbt (100%) rename {src => tests/src}/sbt-test/microsites/config-yml/src/main/resources/myconfig.yml (100%) rename {src => tests/src}/sbt-test/microsites/config-yml/test (55%) rename {src => tests/src}/sbt-test/microsites/extra-md-files/CONSEQUAT.md (100%) rename {src => tests/src}/sbt-test/microsites/extra-md-files/README.md (100%) rename {src => tests/src}/sbt-test/microsites/extra-md-files/build.sbt (75%) rename {src => tests/src}/sbt-test/microsites/extra-md-files/project/plugins.sbt (100%) rename {src => tests/src}/sbt-test/microsites/extra-md-files/test (76%) rename {src => tests/src}/sbt-test/microsites/microsites-config-keys/README.md (100%) rename {src => tests/src}/sbt-test/microsites/microsites-config-keys/build.sbt (70%) rename {src => tests/src}/sbt-test/microsites/microsites-config-keys/project/plugins.sbt (100%) rename {src => tests/src}/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-1.css (100%) rename {src => tests/src}/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-2.css (100%) rename {src => tests/src}/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/sbt.png (100%) rename {src => tests/src}/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/scala.png (100%) rename {src => tests/src}/sbt-test/microsites/microsites-config-keys/src/main/tut/docs.md (100%) create mode 100644 tests/src/sbt-test/microsites/microsites-config-keys/test create mode 100644 tests/src/sbt-test/microsites/microsites-tasks/build.sbt rename {src => tests/src}/sbt-test/microsites/microsites-tasks/project/plugins.sbt (100%) create mode 100644 tests/src/sbt-test/microsites/microsites-tasks/test rename {src => tests/src}/sbt-test/microsites/scala-2-12/README.md (100%) create mode 100644 tests/src/sbt-test/microsites/scala-2-12/build.sbt rename {src => tests/src}/sbt-test/microsites/scala-2-12/project/plugins.sbt (100%) rename {src => tests/src}/sbt-test/microsites/scala-2-12/src/main/tut/docs.md (100%) rename {src/sbt-test/microsites/tut-compile => tests/src/sbt-test/microsites/scala-2-12}/test (54%) rename {src => tests/src}/sbt-test/microsites/tut-compile/README.md (100%) create mode 100644 tests/src/sbt-test/microsites/tut-compile/build.sbt rename {src => tests/src}/sbt-test/microsites/tut-compile/project/plugins.sbt (100%) rename {src => tests/src}/sbt-test/microsites/tut-compile/src/main/tut/docs.md (100%) rename {src/sbt-test/microsites/scala-2-12 => tests/src/sbt-test/microsites/tut-compile}/test (54%) diff --git a/.travis.yml b/.travis.yml index 95233d15..9949efec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -25,9 +25,10 @@ install: - gem install jekyll -v 3.2.1 script: - - sbt ^^$SBT_VERSION clean compile test + - sbt ++SCALA_VERSION ^^$SBT_VERSION clean compile test - if [ "$TRAVIS_BRANCH" = "master" ]; then - sbt ^^$SBT_VERSION scripted; + sbt ++SCALA_VERSION ^^$SBT_VERSION publishLocal; + sbt ++SCALA_VERSION ^^$SBT_VERSION tests/scripted; fi after_success: diff --git a/build.sbt b/build.sbt index fc17e559..6989dfe4 100644 --- a/build.sbt +++ b/build.sbt @@ -5,9 +5,11 @@ pgpSecretRing := file(s"$gpgFolder/secring.gpg") lazy val `sbt-microsites` = (project in file(".")) .settings(moduleName := "sbt-microsites") .settings(pluginSettings: _*) - .settings(testScriptedSettings: _*) .enablePlugins(JekyllPlugin) +lazy val tests = (project in file("tests")) + .settings(moduleName := "sbt-tests") + lazy val docs = (project in file("docs")) .settings(moduleName := "docs") // .settings(micrositeSettings: _*) diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index d34830fc..e8cd2bec 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -2,7 +2,6 @@ import com.typesafe.sbt.site.SitePlugin.autoImport._ // import microsites.MicrositeKeys._ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import sbt.Keys._ -import sbt.ScriptedPlugin.autoImport._ import sbt._ import sbtbuildinfo.BuildInfoPlugin.autoImport._ import sbtorgpolicies.model.{sbtV, scalac} @@ -56,20 +55,6 @@ object ProjectPlugin extends AutoPlugin { } ) - lazy val testScriptedSettings: Seq[(Def.Setting[_])] = - Seq( - scriptedLaunchOpts := { - scriptedLaunchOpts.value ++ - Seq( - "-Xmx2048M", - "-XX:ReservedCodeCacheSize=256m", - "-XX:+UseConcMarkSweepGC", - "-Dplugin.version=" + version.value, - "-Dscala.version=" + scalaVersion.value - ) - } - ) - lazy val buildInfoSettings = Seq( buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion), buildInfoPackage := "microsites" @@ -134,7 +119,7 @@ object ProjectPlugin extends AutoPlugin { (compile in Compile).asRunnableItemFull, (test in Test).asRunnableItemFull, (publishLocal in Global).asRunnableItemFull, - "scripted".asRunnableItemFull, + "tests/scripted".asRunnableItemFull, (jsFullOptGenerateTask in ProjectRef(file("."), "kazari")).asRunnableItem, "docs/tut".asRunnableItem ) diff --git a/project/build.properties b/project/build.properties index 306837db..cddd489c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.0.1 +sbt.version = 0.13.16 diff --git a/project/plugins.sbt b/project/plugins.sbt index bb2b5533..e296b15a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,3 @@ addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.2") -libraryDependencies += { - lazy val sbtVersionValue = (sbtVersion in pluginCrossBuild).value - - scalaVersion.value match { - case "2.10.6" => "org.scala-sbt" % "scripted-plugin" % sbtVersionValue - case _ => "org.scala-sbt" %% "scripted-plugin" % sbtVersionValue - } -} +libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value \ No newline at end of file diff --git a/src/sbt-test/microsites/basic/build.sbt b/src/sbt-test/microsites/basic/build.sbt deleted file mode 100644 index 6000d99d..00000000 --- a/src/sbt-test/microsites/basic/build.sbt +++ /dev/null @@ -1,2 +0,0 @@ -enablePlugins(MicrositesPlugin) -scalaVersion := "2.11.8" diff --git a/src/sbt-test/microsites/change-default-paths/build.sbt b/src/sbt-test/microsites/change-default-paths/build.sbt deleted file mode 100644 index fbaa4384..00000000 --- a/src/sbt-test/microsites/change-default-paths/build.sbt +++ /dev/null @@ -1,16 +0,0 @@ -import microsites._ - -enablePlugins(MicrositesPlugin) -scalaVersion := "2.11.8" - -micrositeExtraMdFiles := Map( - file("README.md") -> ExtraMdFileConfig( - "index.md", - "home" - ) -) - -micrositeExtraMdFilesOutput := (target in Compile).value / "extra_md_override" - -micrositeImgDirectory := (resourceDirectory in Compile).value / "images" -micrositeCssDirectory := (resourceDirectory in Compile).value / "styles" diff --git a/src/sbt-test/microsites/microsites-config-keys/test b/src/sbt-test/microsites/microsites-config-keys/test deleted file mode 100644 index 300f19eb..00000000 --- a/src/sbt-test/microsites/microsites-config-keys/test +++ /dev/null @@ -1,23 +0,0 @@ -# check that the sbt-microsites plugin work well for the specified settings - -> makeMicrosite - -# check images and styles at resource_managed folder - -$ exists target/scala-2.11/resource_managed/main/jekyll/img/scala.png -$ exists target/scala-2.11/resource_managed/main/jekyll/img/sbt.png -$ exists target/scala-2.11/resource_managed/main/jekyll/css/override-1.css -$ exists target/scala-2.11/resource_managed/main/jekyll/css/override-2.css - -# check images and css at site folder - -$ exists target/site/img/scala.png -$ exists target/site/img/sbt.png -$ exists target/site/css/palette.css -$ exists target/site/css/style.css -$ exists target/site/css/override-1.css -$ exists target/site/css/override-2.css - -# check _config.yml file at site folder - -> check diff --git a/src/sbt-test/microsites/microsites-tasks/build.sbt b/src/sbt-test/microsites/microsites-tasks/build.sbt deleted file mode 100644 index 6000d99d..00000000 --- a/src/sbt-test/microsites/microsites-tasks/build.sbt +++ /dev/null @@ -1,2 +0,0 @@ -enablePlugins(MicrositesPlugin) -scalaVersion := "2.11.8" diff --git a/src/sbt-test/microsites/microsites-tasks/test b/src/sbt-test/microsites/microsites-tasks/test deleted file mode 100644 index f3f91ce2..00000000 --- a/src/sbt-test/microsites/microsites-tasks/test +++ /dev/null @@ -1,27 +0,0 @@ -# check that the sbt-microsites plugin tasks work with the default configuration - -> microsite - -> tut - -> makeSite - -> micrositeConfig - -# check resource_managed/main/jekyll folder - -$ exists target/scala-2.11/resource_managed/main/jekyll -$ exists target/scala-2.11/resource_managed/main/jekyll/_config.yml -$ exists target/scala-2.11/resource_managed/main/jekyll/_includes -$ exists target/scala-2.11/resource_managed/main/jekyll/_layouts/docs.html -$ exists target/scala-2.11/resource_managed/main/jekyll/_layouts/home.html -$ exists target/scala-2.11/resource_managed/main/jekyll/_layouts/page.html -$ exists target/scala-2.11/resource_managed/main/jekyll/_sass -$ exists target/scala-2.11/resource_managed/main/jekyll/css -$ exists target/scala-2.11/resource_managed/main/jekyll/js - -# check site folder - -$ exists target/site/_config.yml -$ exists target/site/css -$ exists target/site/js diff --git a/src/sbt-test/microsites/scala-2-12/build.sbt b/src/sbt-test/microsites/scala-2-12/build.sbt deleted file mode 100644 index bb973e9d..00000000 --- a/src/sbt-test/microsites/scala-2-12/build.sbt +++ /dev/null @@ -1,11 +0,0 @@ -import microsites._ - -enablePlugins(MicrositesPlugin) -scalaVersion := "2.12.0" - -micrositeExtraMdFiles := Map( - file("README.md") -> ExtraMdFileConfig( - "index.md", - "home" - ) -) diff --git a/src/sbt-test/microsites/tut-compile/build.sbt b/src/sbt-test/microsites/tut-compile/build.sbt deleted file mode 100644 index 32877700..00000000 --- a/src/sbt-test/microsites/tut-compile/build.sbt +++ /dev/null @@ -1,11 +0,0 @@ -import microsites._ - -enablePlugins(MicrositesPlugin) -scalaVersion := "2.11.8" - -micrositeExtraMdFiles := Map( - file("README.md") -> ExtraMdFileConfig( - "index.md", - "home" - ) -) diff --git a/tests/build.sbt b/tests/build.sbt new file mode 100644 index 00000000..087452d9 --- /dev/null +++ b/tests/build.sbt @@ -0,0 +1,13 @@ +scalaVersion := "2.10.6" + +scriptedSettings + +scriptedDependencies := (scriptedDependencies dependsOn (compile in Test)).value + +scriptedLaunchOpts ++= Seq( + "-Xmx2048M", + "-XX:ReservedCodeCacheSize=256m", + "-XX:+UseConcMarkSweepGC", + "-Dplugin.version=" + version.value, + "-Dscala.version=" + scalaVersion.value +) diff --git a/tests/src/sbt-test/microsites/basic/build.sbt b/tests/src/sbt-test/microsites/basic/build.sbt new file mode 100644 index 00000000..26d9b4e0 --- /dev/null +++ b/tests/src/sbt-test/microsites/basic/build.sbt @@ -0,0 +1,12 @@ +enablePlugins(MicrositesPlugin) + +scalaVersion := sys.props("scala.version") + +lazy val check = TaskKey[Unit]("check") + +check := { + val checkPathFile: File = file((crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll") + + if(!checkPathFile.exists()) + sys.error("Jekyll directory doesn't exist.") +} \ No newline at end of file diff --git a/src/sbt-test/microsites/basic/project/plugins.sbt b/tests/src/sbt-test/microsites/basic/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/basic/project/plugins.sbt rename to tests/src/sbt-test/microsites/basic/project/plugins.sbt diff --git a/src/sbt-test/microsites/basic/test b/tests/src/sbt-test/microsites/basic/test similarity index 59% rename from src/sbt-test/microsites/basic/test rename to tests/src/sbt-test/microsites/basic/test index 8d7594d4..d88fc4cb 100644 --- a/src/sbt-test/microsites/basic/test +++ b/tests/src/sbt-test/microsites/basic/test @@ -1,5 +1,4 @@ # check that the sbt-microsites plugin works on a minimal project > makeMicrosite - -$ exists target/scala-2.11/resource_managed/main/jekyll \ No newline at end of file +> check \ No newline at end of file diff --git a/src/sbt-test/microsites/change-default-paths/README.md b/tests/src/sbt-test/microsites/change-default-paths/README.md similarity index 100% rename from src/sbt-test/microsites/change-default-paths/README.md rename to tests/src/sbt-test/microsites/change-default-paths/README.md diff --git a/tests/src/sbt-test/microsites/change-default-paths/build.sbt b/tests/src/sbt-test/microsites/change-default-paths/build.sbt new file mode 100644 index 00000000..6314643d --- /dev/null +++ b/tests/src/sbt-test/microsites/change-default-paths/build.sbt @@ -0,0 +1,38 @@ +import microsites._ + +enablePlugins(MicrositesPlugin) + +scalaVersion := sys.props("scala.version") + +micrositeExtraMdFiles := Map( + file("README.md") -> ExtraMdFileConfig( + "index.md", + "home" + ) +) + +micrositeExtraMdFilesOutput := (target in Compile).value / "extra_md_override" + +micrositeImgDirectory := (resourceDirectory in Compile).value / "images" +micrositeCssDirectory := (resourceDirectory in Compile).value / "styles" + +lazy val check = TaskKey[Unit]("check") + +check := { + val baseTargetPath = (crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll/" + + // check images and styles at resource_managed folder + + if(!file(baseTargetPath + "img/scala.png").exists()) + sys.error("scala.png doesn't exist.") + + if(!file(baseTargetPath + "img/sbt.png").exists()) + sys.error("sbt.png doesn't exist.") + + if(!file(baseTargetPath + "css/override-1.css").exists()) + sys.error("override-1.css doesn't exist.") + + if(!file(baseTargetPath + "css/override-2.css").exists()) + sys.error("override-2.css doesn't exist.") + +} \ No newline at end of file diff --git a/src/sbt-test/microsites/change-default-paths/project/plugins.sbt b/tests/src/sbt-test/microsites/change-default-paths/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/change-default-paths/project/plugins.sbt rename to tests/src/sbt-test/microsites/change-default-paths/project/plugins.sbt diff --git a/src/sbt-test/microsites/change-default-paths/src/main/resources/images/sbt.png b/tests/src/sbt-test/microsites/change-default-paths/src/main/resources/images/sbt.png similarity index 100% rename from src/sbt-test/microsites/change-default-paths/src/main/resources/images/sbt.png rename to tests/src/sbt-test/microsites/change-default-paths/src/main/resources/images/sbt.png diff --git a/src/sbt-test/microsites/change-default-paths/src/main/resources/images/scala.png b/tests/src/sbt-test/microsites/change-default-paths/src/main/resources/images/scala.png similarity index 100% rename from src/sbt-test/microsites/change-default-paths/src/main/resources/images/scala.png rename to tests/src/sbt-test/microsites/change-default-paths/src/main/resources/images/scala.png diff --git a/src/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-1.css b/tests/src/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-1.css similarity index 100% rename from src/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-1.css rename to tests/src/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-1.css diff --git a/src/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-2.css b/tests/src/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-2.css similarity index 100% rename from src/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-2.css rename to tests/src/sbt-test/microsites/change-default-paths/src/main/resources/styles/override-2.css diff --git a/src/sbt-test/microsites/change-default-paths/src/main/tut/docs.md b/tests/src/sbt-test/microsites/change-default-paths/src/main/tut/docs.md similarity index 100% rename from src/sbt-test/microsites/change-default-paths/src/main/tut/docs.md rename to tests/src/sbt-test/microsites/change-default-paths/src/main/tut/docs.md diff --git a/src/sbt-test/microsites/change-default-paths/test b/tests/src/sbt-test/microsites/change-default-paths/test similarity index 53% rename from src/sbt-test/microsites/change-default-paths/test rename to tests/src/sbt-test/microsites/change-default-paths/test index 5ff92dc6..5ade9304 100644 --- a/src/sbt-test/microsites/change-default-paths/test +++ b/tests/src/sbt-test/microsites/change-default-paths/test @@ -1,13 +1,7 @@ # check that the sbt-microsites plugin work well changing the default paths > makeMicrosite - -# check images and styles at resource_managed folder - -$ exists target/scala-2.11/resource_managed/main/jekyll/img/scala.png -$ exists target/scala-2.11/resource_managed/main/jekyll/img/sbt.png -$ exists target/scala-2.11/resource_managed/main/jekyll/css/override-1.css -$ exists target/scala-2.11/resource_managed/main/jekyll/css/override-2.css +> check # check images and css at site folder diff --git a/src/sbt-test/microsites/config-hosting/README.md b/tests/src/sbt-test/microsites/config-hosting/README.md similarity index 100% rename from src/sbt-test/microsites/config-hosting/README.md rename to tests/src/sbt-test/microsites/config-hosting/README.md diff --git a/src/sbt-test/microsites/config-hosting/build.sbt b/tests/src/sbt-test/microsites/config-hosting/build.sbt similarity index 76% rename from src/sbt-test/microsites/config-hosting/build.sbt rename to tests/src/sbt-test/microsites/config-hosting/build.sbt index cb37aaee..2f1b9865 100644 --- a/src/sbt-test/microsites/config-hosting/build.sbt +++ b/tests/src/sbt-test/microsites/config-hosting/build.sbt @@ -1,7 +1,8 @@ import microsites._ enablePlugins(MicrositesPlugin) -scalaVersion := "2.11.8" + +scalaVersion := sys.props("scala.version") micrositeGitHostingService := GitLab micrositeGitHostingUrl := "https://gitlab.com/gitlab-org/gitlab-ce" @@ -19,6 +20,11 @@ def getLines(fileName: String) = lazy val check = TaskKey[Unit]("check") check := { + val checkPathFile: File = file((crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll") + + if(!checkPathFile.exists()) + sys.error("Jekyll directory doesn't exist.") + val content = getLines("target/site/index.html").mkString if (!content.contains("View on GitLab")) diff --git a/src/sbt-test/microsites/config-hosting/project/plugins.sbt b/tests/src/sbt-test/microsites/config-hosting/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/config-hosting/project/plugins.sbt rename to tests/src/sbt-test/microsites/config-hosting/project/plugins.sbt diff --git a/src/sbt-test/microsites/config-hosting/test b/tests/src/sbt-test/microsites/config-hosting/test similarity index 57% rename from src/sbt-test/microsites/config-hosting/test rename to tests/src/sbt-test/microsites/config-hosting/test index 7ebafb7e..ce3b45a9 100644 --- a/src/sbt-test/microsites/config-hosting/test +++ b/tests/src/sbt-test/microsites/config-hosting/test @@ -1,9 +1,4 @@ # check that the sbt-microsites plugin works customizing which git hosting is used from sbt > makeMicrosite - -$ exists target/scala-2.11/resource_managed/main/jekyll - -# check the index.html file - > check \ No newline at end of file diff --git a/src/sbt-test/microsites/config-yml/CONSEQUAT.md b/tests/src/sbt-test/microsites/config-yml/CONSEQUAT.md similarity index 100% rename from src/sbt-test/microsites/config-yml/CONSEQUAT.md rename to tests/src/sbt-test/microsites/config-yml/CONSEQUAT.md diff --git a/src/sbt-test/microsites/config-yml/README.md b/tests/src/sbt-test/microsites/config-yml/README.md similarity index 100% rename from src/sbt-test/microsites/config-yml/README.md rename to tests/src/sbt-test/microsites/config-yml/README.md diff --git a/src/sbt-test/microsites/config-yml/build.sbt b/tests/src/sbt-test/microsites/config-yml/build.sbt similarity index 77% rename from src/sbt-test/microsites/config-yml/build.sbt rename to tests/src/sbt-test/microsites/config-yml/build.sbt index 5ea084c6..f6710f41 100644 --- a/src/sbt-test/microsites/config-yml/build.sbt +++ b/tests/src/sbt-test/microsites/config-yml/build.sbt @@ -1,7 +1,8 @@ import microsites._ enablePlugins(MicrositesPlugin) -scalaVersion := "2.12.1" + +scalaVersion := sys.props("scala.version") micrositeConfigYaml := ConfigYml( yamlCustomProperties = Map("org" -> "Test"), @@ -17,6 +18,11 @@ def getLines(fileName: String) = lazy val check = TaskKey[Unit]("check") check := { + val checkPathFile: File = file((crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll") + + if(!checkPathFile.exists()) + sys.error("Jekyll directory doesn't exist.") + val content = getLines("target/site/_config.yml").mkString if (!content.contains("org: Test")) diff --git a/src/sbt-test/microsites/config-yml/project/plugins.sbt b/tests/src/sbt-test/microsites/config-yml/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/config-yml/project/plugins.sbt rename to tests/src/sbt-test/microsites/config-yml/project/plugins.sbt diff --git a/src/sbt-test/microsites/config-yml/src/main/resources/myconfig.yml b/tests/src/sbt-test/microsites/config-yml/src/main/resources/myconfig.yml similarity index 100% rename from src/sbt-test/microsites/config-yml/src/main/resources/myconfig.yml rename to tests/src/sbt-test/microsites/config-yml/src/main/resources/myconfig.yml diff --git a/src/sbt-test/microsites/config-yml/test b/tests/src/sbt-test/microsites/config-yml/test similarity index 55% rename from src/sbt-test/microsites/config-yml/test rename to tests/src/sbt-test/microsites/config-yml/test index 0138d0a9..992f7cd4 100644 --- a/src/sbt-test/microsites/config-yml/test +++ b/tests/src/sbt-test/microsites/config-yml/test @@ -1,9 +1,4 @@ # check that the sbt-microsites plugin works customizing the _config.yml file from sbt > makeMicrosite - -$ exists target/scala-2.12/resource_managed/main/jekyll - -# check the _config.yml file - > check \ No newline at end of file diff --git a/src/sbt-test/microsites/extra-md-files/CONSEQUAT.md b/tests/src/sbt-test/microsites/extra-md-files/CONSEQUAT.md similarity index 100% rename from src/sbt-test/microsites/extra-md-files/CONSEQUAT.md rename to tests/src/sbt-test/microsites/extra-md-files/CONSEQUAT.md diff --git a/src/sbt-test/microsites/extra-md-files/README.md b/tests/src/sbt-test/microsites/extra-md-files/README.md similarity index 100% rename from src/sbt-test/microsites/extra-md-files/README.md rename to tests/src/sbt-test/microsites/extra-md-files/README.md diff --git a/src/sbt-test/microsites/extra-md-files/build.sbt b/tests/src/sbt-test/microsites/extra-md-files/build.sbt similarity index 75% rename from src/sbt-test/microsites/extra-md-files/build.sbt rename to tests/src/sbt-test/microsites/extra-md-files/build.sbt index fc5868bf..c6039e2f 100644 --- a/src/sbt-test/microsites/extra-md-files/build.sbt +++ b/tests/src/sbt-test/microsites/extra-md-files/build.sbt @@ -1,7 +1,8 @@ import microsites._ enablePlugins(MicrositesPlugin) -scalaVersion := "2.12.1" + +scalaVersion := sys.props("scala.version") micrositeExtraMdFiles := Map( file("README.md") -> ExtraMdFileConfig( @@ -18,6 +19,15 @@ micrositeExtraMdFiles := Map( def getLines(fileName: String) = IO.readLines(file(fileName)) +lazy val check = TaskKey[Unit]("check") + +check := { + val checkPathFile: File = file((crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll") + + if(!checkPathFile.exists()) + sys.error("Jekyll directory doesn't exist.") +} + lazy val checkReadme = TaskKey[Unit]("checkReadme") checkReadme := { diff --git a/src/sbt-test/microsites/extra-md-files/project/plugins.sbt b/tests/src/sbt-test/microsites/extra-md-files/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/extra-md-files/project/plugins.sbt rename to tests/src/sbt-test/microsites/extra-md-files/project/plugins.sbt diff --git a/src/sbt-test/microsites/extra-md-files/test b/tests/src/sbt-test/microsites/extra-md-files/test similarity index 76% rename from src/sbt-test/microsites/extra-md-files/test rename to tests/src/sbt-test/microsites/extra-md-files/test index 0c5bce9c..2e4692eb 100644 --- a/src/sbt-test/microsites/extra-md-files/test +++ b/tests/src/sbt-test/microsites/extra-md-files/test @@ -1,8 +1,7 @@ # check that the sbt-microsites plugin works for external files outside tut directory > makeMicrosite - -$ exists target/scala-2.12/resource_managed/main/jekyll +> check # check readme.md file diff --git a/src/sbt-test/microsites/microsites-config-keys/README.md b/tests/src/sbt-test/microsites/microsites-config-keys/README.md similarity index 100% rename from src/sbt-test/microsites/microsites-config-keys/README.md rename to tests/src/sbt-test/microsites/microsites-config-keys/README.md diff --git a/src/sbt-test/microsites/microsites-config-keys/build.sbt b/tests/src/sbt-test/microsites/microsites-config-keys/build.sbt similarity index 70% rename from src/sbt-test/microsites/microsites-config-keys/build.sbt rename to tests/src/sbt-test/microsites/microsites-config-keys/build.sbt index db209d5d..242736b7 100644 --- a/src/sbt-test/microsites/microsites-config-keys/build.sbt +++ b/tests/src/sbt-test/microsites/microsites-config-keys/build.sbt @@ -1,7 +1,8 @@ import microsites._ enablePlugins(MicrositesPlugin) -scalaVersion := "2.11.8" + +scalaVersion := sys.props("scala.version") micrositeExtraMdFiles := Map( file("README.md") -> ExtraMdFileConfig( @@ -33,6 +34,22 @@ micrositePalette := Map( lazy val check = TaskKey[Unit]("check") check := { + val baseTargetPath = (crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll/" + + // check images and styles at resource_managed folder + + if(!file(baseTargetPath + "img/scala.png").exists()) + sys.error("scala.png doesn't exist.") + + if(!file(baseTargetPath + "img/sbt.png").exists()) + sys.error("sbt.png doesn't exist.") + + if(!file(baseTargetPath + "css/override-1.css").exists()) + sys.error("override-1.css doesn't exist.") + + if(!file(baseTargetPath + "css/override-2.css").exists()) + sys.error("override-2.css doesn't exist.") + val configFiles = IO.readLines(file("target/site/_config.yml")) configFiles foreach { diff --git a/src/sbt-test/microsites/microsites-config-keys/project/plugins.sbt b/tests/src/sbt-test/microsites/microsites-config-keys/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/microsites-config-keys/project/plugins.sbt rename to tests/src/sbt-test/microsites/microsites-config-keys/project/plugins.sbt diff --git a/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-1.css b/tests/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-1.css similarity index 100% rename from src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-1.css rename to tests/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-1.css diff --git a/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-2.css b/tests/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-2.css similarity index 100% rename from src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-2.css rename to tests/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/css/override-2.css diff --git a/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/sbt.png b/tests/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/sbt.png similarity index 100% rename from src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/sbt.png rename to tests/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/sbt.png diff --git a/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/scala.png b/tests/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/scala.png similarity index 100% rename from src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/scala.png rename to tests/src/sbt-test/microsites/microsites-config-keys/src/main/resources/microsite/img/scala.png diff --git a/src/sbt-test/microsites/microsites-config-keys/src/main/tut/docs.md b/tests/src/sbt-test/microsites/microsites-config-keys/src/main/tut/docs.md similarity index 100% rename from src/sbt-test/microsites/microsites-config-keys/src/main/tut/docs.md rename to tests/src/sbt-test/microsites/microsites-config-keys/src/main/tut/docs.md diff --git a/tests/src/sbt-test/microsites/microsites-config-keys/test b/tests/src/sbt-test/microsites/microsites-config-keys/test new file mode 100644 index 00000000..34484832 --- /dev/null +++ b/tests/src/sbt-test/microsites/microsites-config-keys/test @@ -0,0 +1,14 @@ +# check that the sbt-microsites plugin work well for the specified settings + +> makeMicrosite + +# check images and css at site folder + +$ exists target/site/img/scala.png +$ exists target/site/img/sbt.png +$ exists target/site/css/palette.css +$ exists target/site/css/style.css +$ exists target/site/css/override-1.css +$ exists target/site/css/override-2.css + +> check diff --git a/tests/src/sbt-test/microsites/microsites-tasks/build.sbt b/tests/src/sbt-test/microsites/microsites-tasks/build.sbt new file mode 100644 index 00000000..22e86d25 --- /dev/null +++ b/tests/src/sbt-test/microsites/microsites-tasks/build.sbt @@ -0,0 +1,40 @@ +enablePlugins(MicrositesPlugin) + +scalaVersion := sys.props("scala.version") + +lazy val check = TaskKey[Unit]("check") + +check := { + // check resource_managed/main/jekyll folder + + val baseTargetPath = (crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll/" + + + if(!file(baseTargetPath).exists()) + sys.error("base folder doesn't exist.") + + if(!file(baseTargetPath + "_config.yml").exists()) + sys.error("_config.yml doesn't exist.") + + if(!file(baseTargetPath + "_includes").exists()) + sys.error("_includes doesn't exist.") + + if(!file(baseTargetPath + "_layouts/docs.html").exists()) + sys.error("_layouts/docs.html doesn't exist.") + + if(!file(baseTargetPath + "_layouts/home.html").exists()) + sys.error("_layouts/home.html doesn't exist.") + + if(!file(baseTargetPath + "_layouts/page.html").exists()) + sys.error("_layouts/page.html doesn't exist.") + + if(!file(baseTargetPath + "_sass").exists()) + sys.error("_sass doesn't exist.") + + if(!file(baseTargetPath + "css").exists()) + sys.error("css doesn't exist.") + + if(!file(baseTargetPath + "js").exists()) + sys.error("js doesn't exist.") + +} \ No newline at end of file diff --git a/src/sbt-test/microsites/microsites-tasks/project/plugins.sbt b/tests/src/sbt-test/microsites/microsites-tasks/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/microsites-tasks/project/plugins.sbt rename to tests/src/sbt-test/microsites/microsites-tasks/project/plugins.sbt diff --git a/tests/src/sbt-test/microsites/microsites-tasks/test b/tests/src/sbt-test/microsites/microsites-tasks/test new file mode 100644 index 00000000..e4cf78e9 --- /dev/null +++ b/tests/src/sbt-test/microsites/microsites-tasks/test @@ -0,0 +1,17 @@ +# check that the sbt-microsites plugin tasks work with the default configuration + +> microsite + +> tut + +> makeSite + +> micrositeConfig + +> check + +# check site folder + +$ exists target/site/_config.yml +$ exists target/site/css +$ exists target/site/js diff --git a/src/sbt-test/microsites/scala-2-12/README.md b/tests/src/sbt-test/microsites/scala-2-12/README.md similarity index 100% rename from src/sbt-test/microsites/scala-2-12/README.md rename to tests/src/sbt-test/microsites/scala-2-12/README.md diff --git a/tests/src/sbt-test/microsites/scala-2-12/build.sbt b/tests/src/sbt-test/microsites/scala-2-12/build.sbt new file mode 100644 index 00000000..f1d70eda --- /dev/null +++ b/tests/src/sbt-test/microsites/scala-2-12/build.sbt @@ -0,0 +1,32 @@ +import microsites._ + +enablePlugins(MicrositesPlugin) + +scalaVersion := sys.props("scala.version") + +micrositeExtraMdFiles := Map( + file("README.md") -> ExtraMdFileConfig( + "index.md", + "home" + ) +) + +lazy val check = TaskKey[Unit]("check") + +check := { + + // check markdown resource_managed/main/jekyll folder + + val baseTargetPath = (crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll/" + + + if(!file(baseTargetPath).exists()) + sys.error("base folder doesn't exist.") + + if(!file(baseTargetPath + "index.md").exists()) + sys.error("index.md doesn't exist.") + + if(!file(baseTargetPath + "docs.md").exists()) + sys.error("docs.md doesn't exist.") + +} \ No newline at end of file diff --git a/src/sbt-test/microsites/scala-2-12/project/plugins.sbt b/tests/src/sbt-test/microsites/scala-2-12/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/scala-2-12/project/plugins.sbt rename to tests/src/sbt-test/microsites/scala-2-12/project/plugins.sbt diff --git a/src/sbt-test/microsites/scala-2-12/src/main/tut/docs.md b/tests/src/sbt-test/microsites/scala-2-12/src/main/tut/docs.md similarity index 100% rename from src/sbt-test/microsites/scala-2-12/src/main/tut/docs.md rename to tests/src/sbt-test/microsites/scala-2-12/src/main/tut/docs.md diff --git a/src/sbt-test/microsites/tut-compile/test b/tests/src/sbt-test/microsites/scala-2-12/test similarity index 54% rename from src/sbt-test/microsites/tut-compile/test rename to tests/src/sbt-test/microsites/scala-2-12/test index 0b194952..48e79807 100644 --- a/src/sbt-test/microsites/tut-compile/test +++ b/tests/src/sbt-test/microsites/scala-2-12/test @@ -1,11 +1,7 @@ # check that the sbt-microsites plugin work fine when tut compiles a markdown file > makeMicrosite - -# check markdown resource_managed/main/jekyll folder - -$ exists target/scala-2.11/resource_managed/main/jekyll/index.md -$ exists target/scala-2.11/resource_managed/main/jekyll/docs.md +> check # check site folder diff --git a/src/sbt-test/microsites/tut-compile/README.md b/tests/src/sbt-test/microsites/tut-compile/README.md similarity index 100% rename from src/sbt-test/microsites/tut-compile/README.md rename to tests/src/sbt-test/microsites/tut-compile/README.md diff --git a/tests/src/sbt-test/microsites/tut-compile/build.sbt b/tests/src/sbt-test/microsites/tut-compile/build.sbt new file mode 100644 index 00000000..f1d70eda --- /dev/null +++ b/tests/src/sbt-test/microsites/tut-compile/build.sbt @@ -0,0 +1,32 @@ +import microsites._ + +enablePlugins(MicrositesPlugin) + +scalaVersion := sys.props("scala.version") + +micrositeExtraMdFiles := Map( + file("README.md") -> ExtraMdFileConfig( + "index.md", + "home" + ) +) + +lazy val check = TaskKey[Unit]("check") + +check := { + + // check markdown resource_managed/main/jekyll folder + + val baseTargetPath = (crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll/" + + + if(!file(baseTargetPath).exists()) + sys.error("base folder doesn't exist.") + + if(!file(baseTargetPath + "index.md").exists()) + sys.error("index.md doesn't exist.") + + if(!file(baseTargetPath + "docs.md").exists()) + sys.error("docs.md doesn't exist.") + +} \ No newline at end of file diff --git a/src/sbt-test/microsites/tut-compile/project/plugins.sbt b/tests/src/sbt-test/microsites/tut-compile/project/plugins.sbt similarity index 100% rename from src/sbt-test/microsites/tut-compile/project/plugins.sbt rename to tests/src/sbt-test/microsites/tut-compile/project/plugins.sbt diff --git a/src/sbt-test/microsites/tut-compile/src/main/tut/docs.md b/tests/src/sbt-test/microsites/tut-compile/src/main/tut/docs.md similarity index 100% rename from src/sbt-test/microsites/tut-compile/src/main/tut/docs.md rename to tests/src/sbt-test/microsites/tut-compile/src/main/tut/docs.md diff --git a/src/sbt-test/microsites/scala-2-12/test b/tests/src/sbt-test/microsites/tut-compile/test similarity index 54% rename from src/sbt-test/microsites/scala-2-12/test rename to tests/src/sbt-test/microsites/tut-compile/test index 2d559eb9..48e79807 100644 --- a/src/sbt-test/microsites/scala-2-12/test +++ b/tests/src/sbt-test/microsites/tut-compile/test @@ -1,11 +1,7 @@ # check that the sbt-microsites plugin work fine when tut compiles a markdown file > makeMicrosite - -# check markdown resource_managed/main/jekyll folder - -$ exists target/scala-2.12/resource_managed/main/jekyll/index.md -$ exists target/scala-2.12/resource_managed/main/jekyll/docs.md +> check # check site folder From 468aff7ddcbf27dbd7528c886da2b62074cdc41e Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Fri, 15 Sep 2017 21:03:29 +0200 Subject: [PATCH 2/4] Fixes incompatibilites with deps included by sbt-org-policies --- .travis.yml | 6 ++---- project/ProjectPlugin.scala | 6 ++++-- project/plugins.sbt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9949efec..b191f913 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,8 @@ install: script: - sbt ++SCALA_VERSION ^^$SBT_VERSION clean compile test - - if [ "$TRAVIS_BRANCH" = "master" ]; then - sbt ++SCALA_VERSION ^^$SBT_VERSION publishLocal; - sbt ++SCALA_VERSION ^^$SBT_VERSION tests/scripted; - fi + - sbt ++SCALA_VERSION ^^$SBT_VERSION publishLocal; + - sbt ++SCALA_VERSION ^^$SBT_VERSION tests/scripted; after_success: - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index e8cd2bec..8bd32cba 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -24,8 +24,6 @@ object ProjectPlugin extends AutoPlugin { resolvers ++= Seq( Resolver.sonatypeRepo("snapshots"), "jgit-repo" at "http://download.eclipse.org/jgit/maven"), - 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", %%("moultingyaml"), @@ -46,6 +44,10 @@ object ProjectPlugin extends AutoPlugin { } Seq( + Defaults.sbtPluginExtra( + "com.47deg" % "sbt-org-policies" % "0.6.2", + sbtBinaryVersionValue, + scalaBinaryVersionValue), Defaults.sbtPluginExtra( "org.tpolecat" % "tut-plugin" % tutPluginVersion, sbtBinaryVersionValue, diff --git a/project/plugins.sbt b/project/plugins.sbt index e296b15a..6d7af07f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.2") -libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value \ No newline at end of file +libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value From 2c97e2ccd307de094e3d51b34168eb3aee74887a Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Fri, 15 Sep 2017 21:11:54 +0200 Subject: [PATCH 3/4] Minor travis fix --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b191f913..54c321eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,9 +25,9 @@ install: - gem install jekyll -v 3.2.1 script: - - sbt ++SCALA_VERSION ^^$SBT_VERSION clean compile test - - sbt ++SCALA_VERSION ^^$SBT_VERSION publishLocal; - - sbt ++SCALA_VERSION ^^$SBT_VERSION tests/scripted; + - sbt ++$TRAVIS_SCALA_VERSION ^^$SBT_VERSION clean compile test + - sbt ++$TRAVIS_SCALA_VERSION ^^$SBT_VERSION publishLocal; + - sbt ++$TRAVIS_SCALA_VERSION ^^$SBT_VERSION tests/scripted; after_success: - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then From aa03e74f9f488a0625100afacf9a8ca90f10860c Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Fri, 15 Sep 2017 21:35:52 +0200 Subject: [PATCH 4/4] Fixes scripted test --- tests/src/sbt-test/microsites/extra-md-files/build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/sbt-test/microsites/extra-md-files/build.sbt b/tests/src/sbt-test/microsites/extra-md-files/build.sbt index c6039e2f..4d8a94d2 100644 --- a/tests/src/sbt-test/microsites/extra-md-files/build.sbt +++ b/tests/src/sbt-test/microsites/extra-md-files/build.sbt @@ -32,7 +32,7 @@ lazy val checkReadme = TaskKey[Unit]("checkReadme") checkReadme := { val lines = - getLines("target/scala-2.12/resource_managed/main/jekyll/readme.md") + getLines((crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll/readme.md") if (!lines(1).contains("home")) sys.error("Readme file has not layout home") @@ -42,7 +42,7 @@ lazy val checkConsequat = TaskKey[Unit]("checkConsequat") checkConsequat := { val lines = - getLines("target/scala-2.12/resource_managed/main/jekyll/consequat.md") + getLines((crossTarget in Compile).value.getAbsolutePath + "/resource_managed/main/jekyll/consequat.md") if (!lines(1).contains("page")) sys.error("Consequat file has not layout page")