From 079def156d9db7881ceea0ff4dfafc042f8ff68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Sat, 24 Feb 2018 12:50:36 +0200 Subject: [PATCH] #27 Add a scripted test for checking crossproject setup --- build.sbt | 2 -- project/bintray.sbt | 1 - project/git.sbt | 1 - project/plugins.sbt | 3 +++ src/sbt-test/unidoc/crossproject/build.sbt | 18 ++++++++++++++++++ .../crossproject/project/build.properties | 1 + .../unidoc/crossproject/project/plugins.sbt | 5 +++++ src/sbt-test/unidoc/crossproject/test | 5 +++++ .../x/js/src/main/scala/Logger.scala | 12 ++++++++++++ .../x/jvm/src/main/scala/Logger.scala | 5 +++++ .../x/shared/src/main/scala/Logger.scala | 5 +++++ 11 files changed, 54 insertions(+), 4 deletions(-) delete mode 100644 project/bintray.sbt delete mode 100644 project/git.sbt create mode 100644 src/sbt-test/unidoc/crossproject/build.sbt create mode 100644 src/sbt-test/unidoc/crossproject/project/build.properties create mode 100644 src/sbt-test/unidoc/crossproject/project/plugins.sbt create mode 100644 src/sbt-test/unidoc/crossproject/test create mode 100644 src/sbt-test/unidoc/crossproject/x/js/src/main/scala/Logger.scala create mode 100644 src/sbt-test/unidoc/crossproject/x/jvm/src/main/scala/Logger.scala create mode 100644 src/sbt-test/unidoc/crossproject/x/shared/src/main/scala/Logger.scala diff --git a/build.sbt b/build.sbt index d134b78..5be3acd 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,8 @@ lazy val commonSettings = Seq( - git.baseVersion in ThisBuild := "0.4.1-SNAPSHOT", organization in ThisBuild := "com.eed3si9n" ) lazy val root = (project in file(".")). - enablePlugins(GitVersioning). settings(commonSettings: _*). settings( sbtPlugin := true, diff --git a/project/bintray.sbt b/project/bintray.sbt deleted file mode 100644 index 6972373..0000000 --- a/project/bintray.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.3") diff --git a/project/git.sbt b/project/git.sbt deleted file mode 100644 index f6ecec1..0000000 --- a/project/git.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3") diff --git a/project/plugins.sbt b/project/plugins.sbt index c693c13..c295d7c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1,4 @@ +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "2.1.0") +addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.3") + libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value diff --git a/src/sbt-test/unidoc/crossproject/build.sbt b/src/sbt-test/unidoc/crossproject/build.sbt new file mode 100644 index 0000000..c652ad3 --- /dev/null +++ b/src/sbt-test/unidoc/crossproject/build.sbt @@ -0,0 +1,18 @@ +import sbtcrossproject.{crossProject, CrossType} + +lazy val a = project + +lazy val x = crossProject(JSPlatform, JVMPlatform) + .crossType(CrossType.Full) + +lazy val xJs = x.js +lazy val xJvm = x.jvm + +lazy val root = project.in(file(".")) + .settings( + unidocProjectFilter in (ScalaUnidoc, unidoc) := { + inAnyProject -- inProjects(xJs) + } + ) + .enablePlugins(ScalaUnidocPlugin) + .aggregate(a, xJs, xJvm) diff --git a/src/sbt-test/unidoc/crossproject/project/build.properties b/src/sbt-test/unidoc/crossproject/project/build.properties new file mode 100644 index 0000000..31334bb --- /dev/null +++ b/src/sbt-test/unidoc/crossproject/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.1.1 diff --git a/src/sbt-test/unidoc/crossproject/project/plugins.sbt b/src/sbt-test/unidoc/crossproject/project/plugins.sbt new file mode 100644 index 0000000..5da98d7 --- /dev/null +++ b/src/sbt-test/unidoc/crossproject/project/plugins.sbt @@ -0,0 +1,5 @@ +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22") +addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "0.3.1") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.3.1") + +addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % System.getProperty("plugin.version")) diff --git a/src/sbt-test/unidoc/crossproject/test b/src/sbt-test/unidoc/crossproject/test new file mode 100644 index 0000000..0c95b9e --- /dev/null +++ b/src/sbt-test/unidoc/crossproject/test @@ -0,0 +1,5 @@ +> unidoc + +$ exists target/scala-2.12/unidoc/crossproject/index.html +$ exists target/scala-2.12/unidoc/crossproject/Logger.html +$ exists target/scala-2.12/unidoc/crossproject/LoggerImpl.html diff --git a/src/sbt-test/unidoc/crossproject/x/js/src/main/scala/Logger.scala b/src/sbt-test/unidoc/crossproject/x/js/src/main/scala/Logger.scala new file mode 100644 index 0000000..8abcfb5 --- /dev/null +++ b/src/sbt-test/unidoc/crossproject/x/js/src/main/scala/Logger.scala @@ -0,0 +1,12 @@ +package crossproject + +import scala.scalajs.js.Dynamic.global + +class LoggerImpl extends Logger { + def log(s: String) = { + val document = global.document + val newP = document.createElement("p") + newP.innerHTML = "s" + document.appendChild(newP) + } +} \ No newline at end of file diff --git a/src/sbt-test/unidoc/crossproject/x/jvm/src/main/scala/Logger.scala b/src/sbt-test/unidoc/crossproject/x/jvm/src/main/scala/Logger.scala new file mode 100644 index 0000000..49212e0 --- /dev/null +++ b/src/sbt-test/unidoc/crossproject/x/jvm/src/main/scala/Logger.scala @@ -0,0 +1,5 @@ +package crossproject + +class LoggerImpl extends Logger { + def log(s: String) = println(s) +} diff --git a/src/sbt-test/unidoc/crossproject/x/shared/src/main/scala/Logger.scala b/src/sbt-test/unidoc/crossproject/x/shared/src/main/scala/Logger.scala new file mode 100644 index 0000000..e070030 --- /dev/null +++ b/src/sbt-test/unidoc/crossproject/x/shared/src/main/scala/Logger.scala @@ -0,0 +1,5 @@ +package crossproject + +trait Logger { + def log(s: String) +}