Merge remote-tracking branch 'origin/master' into community-build-2.13

Author: SethTisue

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: lihaoyi

.github/workflows/actions.yml

@@ -0,0 +1,61 @@
+name: ci
+
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Run tests
+        run: ./mill -i __.publishArtifacts __.test
+
+  publish-sonatype:
+    if: github.repository == 'com-lihaoyi/utest' && contains(github.ref, 'refs/tags/')
+    needs: test
+    runs-on: ubuntu-latest
+    env:
+      SONATYPE_PGP_PRIVATE_KEY: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY }}
+      SONATYPE_PGP_PRIVATE_KEY_PASSWORD: ${{ secrets.SONATYPE_PGP_PRIVATE_KEY_PASSWORD }}
+      SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      LANG: "en_US.UTF-8"
+      LC_MESSAGES: "en_US.UTF-8"
+      LC_ALL: "en_US.UTF-8"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Publish to Maven Central
+        run: |
+          if [[ $(git tag --points-at HEAD) != '' ]]; then
+            echo $SONATYPE_PGP_PRIVATE_KEY | base64 --decode > gpg_key
+            gpg --import --no-tty --batch --yes gpg_key
+            rm gpg_key
+            ./mill -i mill.scalalib.PublishModule/publishAll \
+              --sonatypeCreds $SONATYPE_USER:$SONATYPE_PASSWORD \
+              --gpgArgs --passphrase=$SONATYPE_PGP_PRIVATE_KEY_PASSWORD,--no-tty,--pinentry-mode,loopback,--batch,--yes,-a,-b \
+              --publishArtifacts __.publishArtifacts \
+              --readTimeout 600000 \
+              --awaitTimeout 600000 \
+              --release true \
+              --signed true
+          fi
+      - name: Create GitHub Release
+        id: create_gh_release
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          body:
+          draft: false

.gitignore

@@ -1,3 +1,4 @@
 target/
 *.iml
-.idea
+.idea
+out/

.travis.yml

@@ -1,10 +1,27 @@
 import mill._, scalalib._, scalajslib._, scalanativelib._, publish._
+import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1`
+import de.tobiasroeser.mill.vcs.version.VcsVersion
 
+val dottyVersions = sys.props.get("dottyVersion").toList
+
+val scalaVersions = "2.11.12" :: "2.12.13" :: "2.13.4" :: "3.0.0" :: dottyVersions
+val scala2Versions = scalaVersions.filter(_.startsWith("2."))
+
+val scalaJSVersions = for {
+  scalaV <- scalaVersions
+  scalaJSV <- Seq("0.6.33", "1.5.1")
+  if scalaV.startsWith("2.") || scalaJSV.startsWith("1.")
+} yield (scalaV, scalaJSV)
+
+val scalaNativeVersions = for {
+  scalaV <- scala2Versions
+  scalaNativeV <- Seq("0.4.0")
+} yield (scalaV, scalaNativeV)
 
 trait UtestModule extends PublishModule {
   def artifactName = "utest"
 
-  def publishVersion = "0.7.1"
+  def publishVersion = VcsVersion.vcsState().format()
 
   def pomSettings = PomSettings(
     description = artifactName(),
@@ -20,7 +37,7 @@ trait UtestModule extends PublishModule {
     )
   )
 }
-trait UtestMainModule extends CrossScalaModule {
+abstract class UtestMainModule(crossScalaVersion: String) extends CrossScalaModule {
   def millSourcePath = super.millSourcePath / offset
 
   def offset: os.RelPath = os.rel
@@ -33,6 +50,14 @@ trait UtestMainModule extends CrossScalaModule {
         )
       )
   )
+  override def docJar =
+    if (crossScalaVersion.startsWith("2")) super.docJar
+    else T {
+      val outDir = T.ctx().dest
+      val javadocDir = outDir / 'javadoc
+      os.makeDir.all(javadocDir)
+      mill.api.Result.Success(mill.modules.Jvm.createJar(Agg(javadocDir))(outDir))
+    }
 }
 
 
@@ -56,44 +81,43 @@ trait UtestTestModule extends ScalaModule with TestModule {
 }
 
 object utest extends Module {
-  object jvm extends Cross[JvmUtestModule]("2.12.8", "2.13.0")
+  object jvm extends Cross[JvmUtestModule](scalaVersions: _*)
   class JvmUtestModule(val crossScalaVersion: String)
-    extends UtestMainModule with ScalaModule with UtestModule {
+    extends UtestMainModule(crossScalaVersion) with ScalaModule with UtestModule {
     def ivyDeps = Agg(
-      ivy"org.scala-sbt:test-interface::1.0",
-      ivy"org.portable-scala::portable-scala-reflect::0.1.0",
+      ivy"org.scala-sbt:test-interface::1.0"
+    ) ++ (if (crossScalaVersion.startsWith("2")) Agg(
+      ivy"org.portable-scala::portable-scala-reflect::0.1.1",
       ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
-    )
+    ) else Agg())
     object test extends Tests with UtestTestModule{
       val crossScalaVersion = JvmUtestModule.this.crossScalaVersion
     }
   }
 
-  object js extends Cross[JsUtestModule](
-    ("2.12.8", "0.6.26"), ("2.13.0", "0.6.28")/*, ("2.12.8", "1.0.0-M8"), ("2.13.0", "1.0.0-M8")*/
-  )
+  object js extends Cross[JsUtestModule](scalaJSVersions: _*)
   class JsUtestModule(val crossScalaVersion: String, crossJSVersion: String)
-    extends UtestMainModule with ScalaJSModule with UtestModule {
+    extends UtestMainModule(crossScalaVersion) with ScalaJSModule with UtestModule {
     def offset = os.up
     def ivyDeps = Agg(
-      ivy"org.scala-js::scalajs-test-interface:$crossJSVersion",
-      ivy"org.portable-scala::portable-scala-reflect::0.1.0",
+      ivy"org.scala-js::scalajs-test-interface:$crossJSVersion".withDottyCompat(crossScalaVersion),
+      ivy"org.portable-scala::portable-scala-reflect::0.1.1".withDottyCompat(crossScalaVersion)
+    ) ++ (if(crossScalaVersion.startsWith("2")) Agg(
       ivy"org.scala-lang:scala-reflect:$crossScalaVersion"
-    )
+    ) else Agg())
     def scalaJSVersion = crossJSVersion
     object test extends Tests with UtestTestModule{
       def offset = os.up
       val crossScalaVersion = JsUtestModule.this.crossScalaVersion
     }
   }
 
-  object native extends Cross[NativeUtestModule](("2.11.12", "0.3.8")/*, ("2.11.12", "0.4.0-M2")*/)
+  object native extends Cross[NativeUtestModule](scalaNativeVersions: _*)
   class NativeUtestModule(val crossScalaVersion: String, crossScalaNativeVersion: String)
-    extends UtestMainModule with ScalaNativeModule with UtestModule {
+    extends UtestMainModule(crossScalaVersion) with ScalaNativeModule with UtestModule {
     def offset = os.up
     def ivyDeps = super.ivyDeps() ++ Agg(
-      ivy"org.scala-native::test-interface::$crossScalaNativeVersion",
-      ivy"org.scala-lang:scala-reflect:$crossScalaVersion",
+      ivy"org.scala-native::test-interface::$crossScalaNativeVersion"
     )
 
     def scalaNativeVersion = crossScalaNativeVersion

build.sc

@@ -3,7 +3,7 @@
 # This is a wrapper script, that automatically download mill from GitHub release pages
 # You can give the required mill version with MILL_VERSION env variable
 # If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
-DEFAULT_MILL_VERSION=0.5.0
+DEFAULT_MILL_VERSION=0.9.6-61-bd7927
 
 set -e
 
@@ -17,13 +17,24 @@ if [ -z "$MILL_VERSION" ] ; then
   fi
 fi
 
-MILL_DOWNLOAD_PATH="$HOME/.mill/download"
-MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/$MILL_VERSION"
+if [ "x${XDG_CACHE_HOME}" != "x" ] ; then
+  MILL_DOWNLOAD_PATH="${XDG_CACHE_HOME}/mill/download"
+else
+  MILL_DOWNLOAD_PATH="${HOME}/.cache/mill/download"
+fi
+MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/${MILL_VERSION}"
+
+version_remainder="$MILL_VERSION"
+MILL_MAJOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
+MILL_MINOR_VERSION="${version_remainder%%.*}"; version_remainder="${version_remainder#*.}"
 
 if [ ! -x "$MILL_EXEC_PATH" ] ; then
   mkdir -p $MILL_DOWNLOAD_PATH
+  if [ "$MILL_MAJOR_VERSION" -gt 0 ] || [ "$MILL_MINOR_VERSION" -ge 5 ] ; then
+    ASSEMBLY="-assembly"
+  fi
   DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
-  MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION-assembly"
+  MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION${ASSEMBLY}"
   curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
   chmod +x "$DOWNLOAD_FILE"
   mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"

mill

@@ -1,4 +1,4 @@
-µTest 0.7.1 [![Build Status][travis-badge]][travis-link] [![Gitter Chat][gitter-badge]][gitter-link]
+µTest 0.7.10 [![Build Status][travis-badge]][travis-link] [![Gitter Chat][gitter-badge]][gitter-link]
 ====================================================================================================
 
 [travis-badge]: https://travis-ci.org/lihaoyi/utest.svg
@@ -80,15 +80,15 @@ can immediately begin defining and running tests programmatically.
 
 
 ```scala
-libraryDependencies += "com.lihaoyi" %% "utest" % "0.7.1" % "test"
+libraryDependencies += "com.lihaoyi" %% "utest" % "0.7.10" % "test"
 
 testFrameworks += new TestFramework("utest.runner.Framework")
 ```
 
 To use it with Scala.js or Scala-Native:
 
 ```scala
-libraryDependencies += "com.lihaoyi" %%% "utest" % "0.7.1" % "test"
+libraryDependencies += "com.lihaoyi" %%% "utest" % "0.7.10" % "test"
 
 testFrameworks += new TestFramework("utest.runner.Framework")
 ```
@@ -1329,6 +1329,49 @@ libraries are currently at.
 Changelog
 =========
 
+0.7.10
+-----
+
+- Add support for Scala 3.0.0
+
+0.7.9
+-----
+
+- Add support for Scala 3.0.0-RC3
+- Bump Scala.js from 1.4.0 to 1.5.1
+
+0.7.8
+-----
+
+- Add support for Scala 3.0.0-RC2
+- Support Scala 3 on Scala.js
+
+0.7.7
+-----
+
+- Re-publish to maven central only. The version 0.7.6 broke binary compatibility
+  with JDK 8.
+
+0.7.6
+-----
+
+- Support for Scala-Native 0.4.x
+
+0.7.4
+-----
+
+- Add support for Scala.js 1.0.0
+
+0.7.3
+-----
+
+- Add support for Scala.js 1.0.0-RC2
+
+0.7.2
+-----
+
+- Add support for Scala.js 1.0.0-RC1
+
 0.7.1
 -----
 

readme.md

@@ -4,7 +4,7 @@ import scala.concurrent.Future
 import org.portablescala.reflect.Reflect
 
 /**
- * Platform specific stuff that differs between JVM and JS
+ * Platform specific stuff that differs between JVM, JS and Native
  */
 object PlatformShims {
   def await[T](f: Future[T]): T = {

utest/js/src/utest/PlatformShims.scala

@@ -0,0 +1,7 @@
+package utest
+
+object TestUtil {
+
+  lazy val isDotty = false
+
+}

utest/js/test/src-2/test/utest/TestUtil.scala

@@ -0,0 +1,7 @@
+package utest
+
+object TestUtil {
+
+  lazy val isDotty = true
+
+}