merge

47degrees · Apr 23, 2018 · c937a7d · c937a7d
2 parents dbdd569 + 7e7b96b
commit c937a7d
Show file tree

Hide file tree

Showing 33 changed files with 119 additions and 123 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,15 @@
 language: scala
 scala:
-  - 2.12.0
+  - 2.12.5
 
 jdk:
   - oraclejdk8
 
 # Demo tests are designed to fail; so only test compile
-script: sbt test:compile
+script: sbt lambda-test/test:compile
 
 after_success:
-   - (sbt clean coverage "test:runMain demo.All" "test:runMain coverage.All" test || true)
+   - (sbt clean coverage "lambda-test/test:runMain demo.All" "lambda-test/test:runMain coverage.All" test || true)
    - sbt coverageReport
    - bash <(curl -s https://codecov.io/bash)
 

diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,8 @@
-4/15/2018 Versions 1.3.1
+4/22/2018 Versions 1.3.1
 
    org changed from com.fortysevendev to com.47deg
+   moved src to lambda-test module
+   fixed travis problem
 
 1/23/2017
 

diff --git a/build.sbt b/build.sbt
@@ -1,75 +1,79 @@
 import scalariform.formatter.preferences._
 import com.typesafe.sbt.SbtScalariform
 import com.typesafe.sbt.SbtScalariform.ScalariformKeys
+import sbt.Def
 
-name := "lambda-test"
-
-organization := "com.47deg"
-
-version := "1.3.1"
-
-scalaVersion := "2.12.5"
-
-scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature")
-
-viewSettings
-
-testFrameworks += new TestFramework("com.fortysevendeg.lambdatest.sbtinterface.LambdaFramework")
-
-fork in Test := true
-
-libraryDependencies ++= Seq(
-  "org.scalacheck" %% "scalacheck" % "1.13.4",
-  "org.scala-sbt" % "test-interface" % "1.0",
-  "com.typesafe" % "config" % "1.3.1"
-)
-
-// Scalariform forces indent after infix plus (with no option to override)
-// This makes tests less readable
-// So tests include # format: OFF
-
-SbtScalariform.scalariformSettings
-
-ScalariformKeys.preferences := ScalariformKeys.preferences.value
-.setPreference(SpacesWithinPatternBinders, true)
-.setPreference(SpaceBeforeColon, false)
-.setPreference(SpaceInsideParentheses, false)
-.setPreference(SpaceInsideBrackets, false)
-.setPreference(SpacesAroundMultiImports, true)
-.setPreference(PreserveSpaceBeforeArguments, false)
-.setPreference(CompactStringConcatenation, false)
-.setPreference(DanglingCloseParenthesis, Force)
-.setPreference(CompactControlReadability, false)
-.setPreference(AlignParameters, false)
-.setPreference(AlignArguments, true)
-.setPreference(AlignSingleLineCaseStatements, false)
-.setPreference(DoubleIndentClassDeclaration, false)
-.setPreference(IndentLocalDefs, false)
-.setPreference(MultilineScaladocCommentsStartOnFirstLine, false)
-.setPreference(PlaceScaladocAsterisksBeneathSecondAsterisk, true)
-.setPreference(RewriteArrowSymbols, true)
-
-
-lazy val publishSnapshot = taskKey[Unit]("Publish only if the version is a SNAPSHOT")
-
-publishSnapshot := Def.taskDyn {
-  if (isSnapshot.value) Def.task {
-    PgpKeys.publishSigned.value
-  }
-  else Def.task(println("Actual version is not a Snapshot. Skipping publish."))
-}.value
-
-publishTo := {
-  val nexus = "https://oss.sonatype.org/"
-  if (isSnapshot.value)
-    Some("Snapshots" at nexus + "content/repositories/snapshots")
-  else
-    Some("Releases" at nexus + "service/local/staging/deploy/maven2")
-}
+lazy val gpgFolder = sys.env.getOrElse("GPG_FOLDER", ".")
 
-organizationName := "47 Degrees"
+pgpPassphrase := Some(sys.env.getOrElse("GPG_PASSPHRASE", "").toCharArray)
+pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
+pgpSecretRing := file(s"$gpgFolder/secring.gpg")
 
-organizationHomepage := Some(new URL("http://47deg.com"))
+lazy val commonSettings: Seq[Def.Setting[_]] = Seq(
+  organization := "com.47deg",
+  version := "1.3.1",
+  scalaVersion := "2.12.5",
+  scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature"),
+  ScalariformKeys.preferences := ScalariformKeys.preferences.value
+    .setPreference(SpacesWithinPatternBinders, true)
+    .setPreference(SpaceBeforeColon, false)
+    .setPreference(SpaceInsideParentheses, false)
+    .setPreference(SpaceInsideBrackets, false)
+    .setPreference(SpacesAroundMultiImports, true)
+    .setPreference(PreserveSpaceBeforeArguments, false)
+    .setPreference(CompactStringConcatenation, false)
+    .setPreference(DanglingCloseParenthesis, Force)
+    .setPreference(CompactControlReadability, false)
+    .setPreference(AlignParameters, false)
+    .setPreference(AlignArguments, true)
+    .setPreference(AlignSingleLineCaseStatements, false)
+    .setPreference(DoubleIndentClassDeclaration, false)
+    .setPreference(IndentLocalDefs, false)
+    .setPreference(MultilineScaladocCommentsStartOnFirstLine, false)
+    .setPreference(PlaceScaladocAsterisksBeneathSecondAsterisk, true)
+    .setPreference(RewriteArrowSymbols, true),
+  publishTo := {
+    val nexus = "https://oss.sonatype.org/"
+    if (isSnapshot.value)
+      Some("Snapshots" at nexus + "content/repositories/snapshots")
+    else
+      Some("Releases" at nexus + "service/local/staging/deploy/maven2")
+  },
+  organizationName := "47 Degrees",
+  organizationHomepage := Some(new URL("http://47deg.com")),
+  pgpPassphrase := Some(sys.env.getOrElse("GPG_PASSPHRASE", "").toCharArray),
+  pgpPublicRing := file(s"$gpgFolder/pubring.gpg"),
+  pgpSecretRing := file(s"$gpgFolder/secring.gpg"),
+  credentials += Credentials("Sonatype Nexus Repository Manager",
+    "oss.sonatype.org",
+    sys.env.getOrElse("PUBLISH_USERNAME", ""),
+    sys.env.getOrElse("PUBLISH_PASSWORD", "")),
+  publishMavenStyle := true,
+  publishArtifact in Test := false,
+  pomIncludeRepository := { _ =>
+    false
+  },
+  licenses := Seq(
+    "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")),
+  homepage := Some(url("https://github.com/47deg/LambdaTest")),
+  scmInfo := Some(
+    ScmInfo(url("https://github.com/47deg/LambdaTest"),
+      "scm:git@github.com:47deg/LambdaTest.git")),
+  pomExtra := (
+    <developers>
+      <developer>
+        <name>John Nestor</name>
+        <email>nestor@persist.com</email>
+        <url>http://http://www.47deg.com</url>
+      </developer>
+      <developer>
+        <name>47 Degrees (twitter: @47deg)</name>
+        <email>hello@47deg.com</email>
+        <url>http://http://www.47deg.com</url>
+      </developer>
+    </developers>
+    )
+) ++ viewSettings ++ SbtScalariform.scalariformSettings
 
 lazy val micrositeSettings = Seq(
   micrositeName := "LambdaTest",
@@ -88,64 +92,54 @@ lazy val micrositeSettings = Seq(
     "gray" -> "#646D7B",
     "gray-light" -> "#E6E7EC",
     "gray-lighter" -> "#F4F5F9",
-    "white-color" -> "#E6E7EC"),
-     //siteSubdirName in ScalaUnidoc := "api",
-     //unidocProjectFilter in (ScalaUnidoc, unidoc) := inProjects(lambdatest),
-     git.remoteRepo := "git@github.com:47deg/LambdaTest.git",
-     autoAPIMappings := true,
-     docsMappingsAPIDir := "api",
-     addMappingsToSiteDir(mappings in (ScalaUnidoc,packageDoc), docsMappingsAPIDir)
+    "white-color" -> "#E6E7EC"
+  ),
+  //siteSubdirName in ScalaUnidoc := "api",
+  //unidocProjectFilter in (ScalaUnidoc, unidoc) := inProjects(lambdatest),
+  git.remoteRepo := "git@github.com:47deg/LambdaTest.git",
+  autoAPIMappings := true,
+  docsMappingsAPIDir := "api",
+  addMappingsToSiteDir(mappings in (ScalaUnidoc, packageDoc),
+                       docsMappingsAPIDir)
 )
 
 lazy val docsMappingsAPIDir = settingKey[String](
   "Name of subdirectory in site target directory for api docs")
 
-lazy val noPublishSettings: Seq[Setting[_]] = Seq(
-  publish := {},
-  publishLocal := {}
+lazy val noPublishSettings: Seq[Def.Setting[_]] = Seq(
+  publish := ((): Unit),
+  publishLocal := ((): Unit),
+  publishArtifact := false
 )
 
 lazy val docs = (project in file("docs"))
-.settings(micrositeSettings: _*)
-.settings(unidocSettings)
-.settings(
-  name := "docs",
-  description := "LambdaTest docs"
-)
-.settings(noPublishSettings)
-.enablePlugins(MicrositesPlugin)
-
-lazy val gpgFolder = sys.env.getOrElse("GPG_FOLDER", ".")
-
-pgpPassphrase := Some(sys.env.getOrElse("GPG_PASSPHRASE", "").toCharArray)
-
-pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
-
-pgpSecretRing := file(s"$gpgFolder/secring.gpg")
-
-credentials += Credentials("Sonatype Nexus Repository Manager",
-  "oss.sonatype.org",
-  sys.env.getOrElse("PUBLISH_USERNAME", ""),
-  sys.env.getOrElse("PUBLISH_PASSWORD", ""))
-
-publishMavenStyle := true
-
-publishArtifact in Test := false
-
-pomIncludeRepository := { _ => false }
-
-licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html"))
-
-homepage := Some(url("https://github.com/47deg/LambdaTest"))
-
-scmInfo := Some(ScmInfo(url("https://github.com/47deg/LambdaTest"), "scm:git@github.com:47deg/LambdaTest.git"))
-
-pomExtra := (
-<developers>
-  <developer>
-    <name>47 Degrees (twitter: @47deg)</name>
-    <email>hello@47deg.com</email>
-    <url>http://http://www.47deg.com</url>
-  </developer>
-</developers>
-)
+  .settings(commonSettings)
+  .settings(micrositeSettings: _*)
+  .settings(unidocSettings)
+  .settings(
+    name := "docs",
+    description := "LambdaTest docs"
+  )
+  .settings(noPublishSettings)
+  .enablePlugins(MicrositesPlugin)
+
+lazy val `lambda-test` = (project in file("lambdatest"))
+  .settings(name := "lambda-test")
+  .settings(
+    libraryDependencies ++= Seq(
+      "org.scalacheck" %% "scalacheck" % "1.13.4",
+      "org.scala-sbt" % "test-interface" % "1.0",
+      "com.typesafe" % "config" % "1.3.1"
+    ),
+    testFrameworks += new TestFramework(
+      "com.fortysevendeg.lambdatest.sbtinterface.LambdaFramework"),
+    fork in Test := true
+  )
+  .settings(commonSettings)
+
+lazy val root = (project in file("."))
+  .settings(name := "lambda-test-root")
+  .settings(commonSettings)
+  .settings(noPublishSettings)
+  .aggregap[[lo;pte(`lambda-test`, docs)
+  .dependsOn(`lambda-test`, docs)
diff --git a/foobar.txt → lambdatest/foobar.txt b/foobar.txt → lambdatest/foobar.txt
diff --git a/src/main/resources/reference.conf → lambdatest/src/main/resources/reference.conf b/src/main/resources/reference.conf → lambdatest/src/main/resources/reference.conf
diff --git a/...endeg/lambdatest/HoldLambdaReporter.scala → ...endeg/lambdatest/HoldLambdaReporter.scala b/...endeg/lambdatest/HoldLambdaReporter.scala → ...endeg/lambdatest/HoldLambdaReporter.scala
diff --git a/.../fortysevendeg/lambdatest/LambdaAct.scala → .../fortysevendeg/lambdatest/LambdaAct.scala b/.../fortysevendeg/lambdatest/LambdaAct.scala → .../fortysevendeg/lambdatest/LambdaAct.scala
diff --git a/...tysevendeg/lambdatest/LambdaOptions.scala → ...tysevendeg/lambdatest/LambdaOptions.scala b/...tysevendeg/lambdatest/LambdaOptions.scala → ...tysevendeg/lambdatest/LambdaOptions.scala
diff --git a/...ysevendeg/lambdatest/LambdaReporter.scala → ...ysevendeg/lambdatest/LambdaReporter.scala b/...ysevendeg/lambdatest/LambdaReporter.scala → ...ysevendeg/lambdatest/LambdaReporter.scala
diff --git a/...ortysevendeg/lambdatest/LambdaState.scala → ...ortysevendeg/lambdatest/LambdaState.scala b/...ortysevendeg/lambdatest/LambdaState.scala → ...ortysevendeg/lambdatest/LambdaState.scala
diff --git a/...fortysevendeg/lambdatest/LambdaTest.scala → ...fortysevendeg/lambdatest/LambdaTest.scala b/...fortysevendeg/lambdatest/LambdaTest.scala → ...fortysevendeg/lambdatest/LambdaTest.scala
diff --git a/...deg/lambdatest/StdoutLambdaReporter.scala → ...deg/lambdatest/StdoutLambdaReporter.scala b/...deg/lambdatest/StdoutLambdaReporter.scala → ...deg/lambdatest/StdoutLambdaReporter.scala
diff --git a/...om/fortysevendeg/lambdatest/package.scala → ...om/fortysevendeg/lambdatest/package.scala b/...om/fortysevendeg/lambdatest/package.scala → ...om/fortysevendeg/lambdatest/package.scala
diff --git a/...test/sbtinterface/LambdaFingerprint.scala → ...test/sbtinterface/LambdaFingerprint.scala b/...test/sbtinterface/LambdaFingerprint.scala → ...test/sbtinterface/LambdaFingerprint.scala
diff --git a/...datest/sbtinterface/LambdaFramework.scala → ...datest/sbtinterface/LambdaFramework.scala b/...datest/sbtinterface/LambdaFramework.scala → ...datest/sbtinterface/LambdaFramework.scala
diff --git a/...ambdatest/sbtinterface/LambdaRunner.scala → ...ambdatest/sbtinterface/LambdaRunner.scala b/...ambdatest/sbtinterface/LambdaRunner.scala → ...ambdatest/sbtinterface/LambdaRunner.scala
diff --git a/...test/sbtinterface/SbtLambdaReporter.scala → ...test/sbtinterface/SbtLambdaReporter.scala b/...test/sbtinterface/SbtLambdaReporter.scala → ...test/sbtinterface/SbtLambdaReporter.scala
diff --git a/src/test/resources/application.conf → ...atest/src/test/resources/application.conf b/src/test/resources/application.conf → ...atest/src/test/resources/application.conf
diff --git a/src/test/scala/coverage/All.scala → lambdatest/src/test/scala/coverage/All.scala b/src/test/scala/coverage/All.scala → lambdatest/src/test/scala/coverage/All.scala
diff --git a/src/test/scala/coverage/FailOnly.scala → ...st/src/test/scala/coverage/FailOnly.scala b/src/test/scala/coverage/FailOnly.scala → ...st/src/test/scala/coverage/FailOnly.scala
diff --git a/src/test/scala/coverage/Failure.scala → ...est/src/test/scala/coverage/Failure.scala b/src/test/scala/coverage/Failure.scala → ...est/src/test/scala/coverage/Failure.scala
diff --git a/src/test/scala/coverage/Off.scala → lambdatest/src/test/scala/coverage/Off.scala b/src/test/scala/coverage/Off.scala → lambdatest/src/test/scala/coverage/Off.scala
diff --git a/src/test/scala/demo/All.scala → lambdatest/src/test/scala/demo/All.scala b/src/test/scala/demo/All.scala → lambdatest/src/test/scala/demo/All.scala
diff --git a/src/test/scala/demo/Bad.scala → lambdatest/src/test/scala/demo/Bad.scala b/src/test/scala/demo/Bad.scala → lambdatest/src/test/scala/demo/Bad.scala
diff --git a/src/test/scala/demo/Example.scala → lambdatest/src/test/scala/demo/Example.scala b/src/test/scala/demo/Example.scala → lambdatest/src/test/scala/demo/Example.scala
diff --git a/src/test/scala/demo/Except.scala → lambdatest/src/test/scala/demo/Except.scala b/src/test/scala/demo/Except.scala → lambdatest/src/test/scala/demo/Except.scala
diff --git a/src/test/scala/demo/Generate.scala → ...datest/src/test/scala/demo/Generate.scala b/src/test/scala/demo/Generate.scala → ...datest/src/test/scala/demo/Generate.scala
diff --git a/src/test/scala/demo/Immutable.scala → ...atest/src/test/scala/demo/Immutable.scala b/src/test/scala/demo/Immutable.scala → ...atest/src/test/scala/demo/Immutable.scala
diff --git a/src/test/scala/demo/Mutable.scala → lambdatest/src/test/scala/demo/Mutable.scala b/src/test/scala/demo/Mutable.scala → lambdatest/src/test/scala/demo/Mutable.scala
diff --git a/src/test/scala/demo/Parallel.scala → ...datest/src/test/scala/demo/Parallel.scala b/src/test/scala/demo/Parallel.scala → ...datest/src/test/scala/demo/Parallel.scala
diff --git a/src/test/scala/demo/ScalaCheck.scala → ...test/src/test/scala/demo/ScalaCheck.scala b/src/test/scala/demo/ScalaCheck.scala → ...test/src/test/scala/demo/ScalaCheck.scala
diff --git a/src/test/scala/demo/Tag.scala → lambdatest/src/test/scala/demo/Tag.scala b/src/test/scala/demo/Tag.scala → lambdatest/src/test/scala/demo/Tag.scala
diff --git a/src/test/scala/demo/Wrap.scala → lambdatest/src/test/scala/demo/Wrap.scala b/src/test/scala/demo/Wrap.scala → lambdatest/src/test/scala/demo/Wrap.scala