Merge branch 'feature-dotty-modules' of https://github.com/cheeseng/scalatest into cheeseng-feature-dotty-modules

Author: bvenners

build.sbt

@@ -84,4 +84,17 @@ lazy val scalatestDiagramsNative = ScalatestBuild.scalatestDiagramsNative
 lazy val scalatestMatchersCoreNative = ScalatestBuild.scalatestMatchersCoreNative
 lazy val scalatestShouldMatchersNative = ScalatestBuild.scalatestShouldMatchersNative
 lazy val scalatestMustMatchersNative = ScalatestBuild.scalatestMustMatchersNative
-lazy val scalatestModulesNative = ScalatestBuild.scalatestModulesNative
+lazy val scalatestModulesNative = ScalatestBuild.scalatestModulesNative
+lazy val scalatestCoreDotty = ScalatestBuild.scalatestCoreDotty
+lazy val scalatestFeatureSpecDotty = ScalatestBuild.scalatestFeatureSpecDotty
+lazy val scalatestFlatSpecDotty = ScalatestBuild.scalatestFlatSpecDotty
+lazy val scalatestFreeSpecDotty = ScalatestBuild.scalatestFreeSpecDotty
+lazy val scalatestFunSuiteDotty = ScalatestBuild.scalatestFunSuiteDotty
+lazy val scalatestPropSpecDotty = ScalatestBuild.scalatestPropSpecDotty
+lazy val scalatestRefSpecDotty = ScalatestBuild.scalatestRefSpecDotty
+lazy val scalatestWordSpecDotty = ScalatestBuild.scalatestWordSpecDotty
+lazy val scalatestDiagramsDotty = ScalatestBuild.scalatestDiagramsDotty
+lazy val scalatestMatchersCoreDotty = ScalatestBuild.scalatestMatchersCoreDotty
+lazy val scalatestShouldMatchersDotty = ScalatestBuild.scalatestShouldMatchersDotty
+lazy val scalatestMustMatchersDotty = ScalatestBuild.scalatestMustMatchersDotty
+lazy val scalatestModulesDotty = ScalatestBuild.scalatestModulesDotty

modules/dotty/scalatest-core/src/main/scala/org/scalatest/fixture/package.scala

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2001-2018 Artima, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.scalatest
+
+/**
+ * Classes and traits supporting ScalaTest's "fixture" style traits, which
+ * allow you to pass fixture objects into tests.
+ *
+ * This package is released as part of the `scalatest-core` module.
+ */
+package object fixture

modules/dotty/scalatest-core/src/main/scala/org/scalatest/package.scala

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2001-2013 Artima, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org
+
+/**
+ * ScalaTest's main traits, classes, and other members, including members supporting ScalaTest's DSL for the Scala interpreter.
+ */
+package object scalatest {
+
+   // SKIP-SCALATESTJS,NATIVE-START
+  private val defaultShell = ShellImpl()
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>colorPassed</code> configuration parameter set to <code>true</code>.
+   */
+  lazy val color: Shell = defaultShell.color
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>durationsPassed</code> configuration parameter set to <code>true</code>.
+   */
+  lazy val durations: Shell = defaultShell.durations
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>shortStacksPassed</code> configuration parameter set to <code>true</code>.
+   */
+  lazy val shortstacks: Shell = defaultShell.shortstacks
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>fullStacksPassed</code> configuration parameter set to <code>true</code>.
+   */
+  lazy val fullstacks: Shell = defaultShell.fullstacks
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>statsPassed</code> configuration parameter set to <code>true</code>.
+   */
+  lazy val stats: Shell = defaultShell.stats
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>colorPassed</code> configuration parameter set to <code>false</code>.
+   */
+  lazy val nocolor: Shell = defaultShell.nocolor
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>durationsPassed</code> configuration parameter set to <code>false</code>.
+   */
+  lazy val nodurations: Shell = defaultShell.nodurations
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>shortStacksPassed</code> configuration parameter set to <code>false</code>.
+   */
+  lazy val nostacks: Shell = defaultShell.nostacks
+
+  /**
+   * Returns a copy of this <code>Shell</code> with <code>statsPassed</code> configuration parameter set to <code>false</code>.
+   */
+  lazy val nostats: Shell = defaultShell.nostats
+  // SKIP-SCALATESTJS,NATIVE-END
+
+  /**
+   * The version number of ScalaTest.
+   *
+   * @return the ScalaTest version number.
+   */
+  val ScalaTestVersion: String = ScalaTestVersions.ScalaTestVersion
+
+  private[scalatest] type Expectation = Fact
+
+  /**
+   * Marker trait that serves as the result type of <code>assert</code>, <code>assume</code>, and <code>pending</code> methods of
+   * trait <code>Assertions</code>, which return its only instance, the <code>Succeeded</code> singleton, or throw
+   * an exception that indicates a failed, canceled, or pending test.
+   */
+  type Assertion = compatible.Assertion
+}

project/BuildCommons.scala

@@ -13,6 +13,8 @@ trait BuildCommons {
 
   def rootProject: Project
 
+  def scalatestCompatible: Project
+
   def scalaXmlDependency(theScalaVersion: String): Seq[ModuleID]
 
   def scalatestLibraryDependencies: Seq[ModuleID]