Skip to content

Commit

Permalink
Release 0.5-scala212
Browse files Browse the repository at this point in the history
  • Loading branch information
seblm committed Jan 4, 2022
1 parent 7c5e574 commit 8ef5612
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Here is what you will get starting from
Add this plugin to your `project/plugins.sbt` file:

```sbt
addSbtPlugin("io.github.seblm" % "sbt-jgiven-scalatest-reporter" % "0.5")
addSbtPlugin("io.github.seblm" % "sbt-jgiven-scalatest-reporter" % "0.5-scala212")
```

When you run your ScalaTest tests as usual with sbt.
Expand All @@ -28,7 +28,7 @@ Then you can visit `target/jgiven-reports/html/index.html`.
Add theses settings to your `build.sbt` file:

```sbt
libraryDependencies += "io.github.seblm" %% "jgiven-scalatest-reporter" % "0.5" % Test,
libraryDependencies += "io.github.seblm" %% "jgiven-scalatest-reporter" % "0.5-scala212" % Test,
Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-C", "io.github.seblm.scalatest.jgiven.JGivenHtml5Reporter"),
```

Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lazy val commonSettings = Seq(
scalacOptions += "-deprecation",
sonatypeProjectHosting :=
Some(GitHubHosting("seblm", "sbt-jgiven-scalatest-reporter", "[email protected]")),
version := "0.5"
version := "0.5-scala212"
)

lazy val root = (project in file("."))
Expand All @@ -25,7 +25,7 @@ lazy val root = (project in file("."))
lazy val `jgiven-scalatest-reporter` = (project in file("jgiven-scalatest-reporter"))
.settings(
commonSettings,
scalaVersion := "2.13.7",
scalaVersion := "2.12.15",
libraryDependencies += `jgiven-core`,
libraryDependencies += `jgiven-html5-report`,
libraryDependencies += `log4j-slf4j-impl`,
Expand All @@ -38,7 +38,7 @@ lazy val `jgiven-scalatest-reporter` = (project in file("jgiven-scalatest-report
lazy val `json-scalatest-reporter` = (project in file("json-scalatest-reporter"))
.settings(
commonSettings,
scalaVersion := "2.13.7",
scalaVersion := "2.12.15",
libraryDependencies += gson,
libraryDependencies += `log4j-slf4j-impl`,
libraryDependencies += scalatest,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import org.scalatest.featurespec.AnyFeatureSpecLike
import java.lang.annotation.Annotation
import java.nio.file.{Files, Paths}
import java.util
import scala.collection.JavaConverters._
import scala.collection.Map
import scala.concurrent.duration._
import scala.jdk.CollectionConverters._
import scala.util.Try

class JGivenHtml5Reporter extends ResourcefulReporter {
Expand Down Expand Up @@ -56,7 +56,7 @@ class JGivenHtml5Reporter extends ResourcefulReporter {
currentSpecClass = suiteClassName.flatMap(loadSuiteClass)
currentSpecInstance = currentSpecClass.flatMap(instantiateSuiteClass)
currentSpecClass.map(findTagIds).map(_.asJava).foreach(report.addTags)
reports = reports.concat(Seq(suiteId -> report))
reports = reports + (suiteId -> report)
()
case InfoProvided(_, message, nameInfo, _, _, _, _, _, _) =>
nameInfo
Expand All @@ -68,7 +68,7 @@ class JGivenHtml5Reporter extends ResourcefulReporter {
.map(previousDescription => s"$previousDescription</br>$message")
.getOrElse(message)
)
reports = reports.concat(Seq(suiteId -> report))
reports = reports + (suiteId -> report)
}
()
case TestFailed(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import org.scalatest.events.Event
import java.nio.file.{Files, Paths}
import java.util
import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.io.Source
import scala.jdk.CollectionConverters._

object JGivenHtml5ReporterFixture {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import org.scalatest.matchers.should.Matchers
import org.scalatest.{BeforeAndAfter, GivenWhenThen}

import java.nio.file.{Files, Paths}
import scala.collection.JavaConverters._
import scala.concurrent.duration._
import scala.jdk.CollectionConverters.MapHasAsScala

class JGivenHtml5ReporterSpec extends AnyFeatureSpec with GivenWhenThen with Matchers with BeforeAndAfter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import org.scalatest.events._

import java.lang.reflect.Type
import java.util
import scala.collection.JavaConverters._
import scala.collection.immutable.IndexedSeq
import scala.jdk.CollectionConverters.IterableHasAsJava

object GsonEventSupport {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory.getLogger

import java.lang.reflect.{ParameterizedType, Type}
import java.util
import scala.collection.JavaConverters._
import scala.collection.immutable.IndexedSeq
import scala.jdk.CollectionConverters._

object GsonScala {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import org.scalatest.matchers.should.Matchers._
import java.nio.file.Paths
import java.time.Instant
import java.util
import scala.collection.JavaConverters._
import scala.collection.immutable.IndexedSeq
import scala.io.Source
import scala.jdk.CollectionConverters.CollectionHasAsScala

class JsonReporterSpec extends AnyFlatSpec {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object SbtJgivenScalatestReporterPlugin extends AutoPlugin {
override def trigger = allRequirements

override lazy val projectSettings = Seq(
libraryDependencies += "io.github.seblm" %% "jgiven-scalatest-reporter" % "0.5" % Test,
libraryDependencies += "io.github.seblm" %% "jgiven-scalatest-reporter" % "0.5-scala212" % Test,
Test / testOptions +=
Tests.Argument(TestFrameworks.ScalaTest, "-C", "io.github.seblm.scalatest.jgiven.JGivenHtml5Reporter")
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
maxColumn = 120
rewrite.rules = [SortImports]
runner.dialect = "scala213"
runner.dialect = "scala212"
version = 3.2.2

0 comments on commit 8ef5612

Please sign in to comment.