Merge pull request #200 from alexarchambault/using-directives

Tweak directive parsing

Author: alexarchambault

.github/workflows/ci.yml

@@ -305,36 +305,28 @@ jobs:
       - uses: coursier/[email protected]
         with:
           jvm: 8
-      - run: ./mill -i ci.setShouldPublish
       - uses: actions/download-artifact@v2
-        if: env.SHOULD_PUBLISH == 'true'
         with:
           name: launchers
           path: artifacts/
       - name: Display structure of downloaded files
-        if: env.SHOULD_PUBLISH == 'true'
         run: ls -R
         working-directory: artifacts/
       - uses: webfactory/ssh-agent@5f066a372ec13036ab7cb9a8adf18c936f8d2043
-        if: env.SHOULD_PUBLISH == 'true'
         with:
           ssh-private-key: |
             ${{ secrets.SCALA_CLI_PACKAGES_KEY }}
             ${{ secrets.HOMEBREW_SCALA_CLI_KEY }}
       - run: ./mill -i ci.updateBrewFormula
-        if: env.SHOULD_PUBLISH == 'true'
       - name: GPG setup
         run: .github/scripts/gpg-setup.sh
-        if: env.SHOULD_PUBLISH == 'true'
         env:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
       - run: ./mill -i ci.updateDebianPackages
-        if: env.SHOULD_PUBLISH == 'true'
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           GPG_EMAIL: ${{ secrets.GPG_EMAIL }}
       - run: ./mill -i ci.updateCentOsPackages
-        if: env.SHOULD_PUBLISH == 'true'
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           KEYGRIP: ${{ secrets.KEYGRIP }}
@@ -385,13 +377,10 @@ jobs:
     - uses: coursier/[email protected]
       with:
         jvm: 8
-    - run: ./mill -i ci.setShouldPublish
     - uses: actions/[email protected]
-      if: env.SHOULD_PUBLISH == 'true'
       with:
         node-version: '12.x'
     - run: .github/scripts/update-website.sh
-      if: env.SHOULD_PUBLISH == 'true'
       env:
         GIT_USER: Virtuslab
         DEPLOYMENT_BRANCH: gh-pages

build.sc

@@ -179,7 +179,8 @@ class Build(val crossScalaVersion: String)
     Deps.scalametaTrees,
     Deps.scalaparse,
     Deps.shapeless,
-    Deps.swoval
+    Deps.swoval,
+    Deps.usingDirectives
   )
 
   private def vcsState = T.persistent {

examples/cross-build/Hello.js.scala

@@ -1,5 +1,5 @@
 // using scala 2.13
-// require scala-js
+// using target scala-js
 
 import scala.scalajs.js
 

examples/cross-build/Hello.native.scala

@@ -1,5 +1,5 @@
 // using scala 2.13
-// require scala-native
+// using target scala-native
 
 import scala.scalanative.libc._
 import scala.scalanative.unsafe._

examples/utest/MyTests.scala

@@ -1,4 +1,4 @@
-// using "com.lihaoyi::utest::0.7.10"
+@using lib "com.lihaoyi::utest::0.7.10"
 
 import utest._
 

modules/build/src/main/scala/scala/build/errors/DependencyFormatError.scala

@@ -0,0 +1,9 @@
+package scala.build.errors
+
+final class DependencyFormatError(
+  val dependencyString: String,
+  val error: String,
+  val originOpt: Option[String] = None
+) extends BuildException(
+      s"Error parsing ${originOpt.getOrElse("")}dependency '$dependencyString': $error"
+    )

modules/build/src/main/scala/scala/build/errors/DirectiveErrors.scala

@@ -0,0 +1,5 @@
+package scala.build.errors
+
+final class DirectiveErrors(errors: ::[String]) extends BuildException(
+      "Directives errors: " + errors.mkString(", ")
+    )

modules/build/src/main/scala/scala/build/errors/InvalidDirectiveError.scala

@@ -0,0 +1,5 @@
+package scala.build.errors
+
+final class MalformedPlatformError(marformedInput: String) extends BuildException(
+      s"Unrecognized platform: $marformedInput"
+    )

modules/build/src/main/scala/scala/build/errors/MalformedPlatformError.scala

@@ -0,0 +1,5 @@
+package scala.build.errors
+
+final class NoScalaVersionProvidedError extends BuildException(
+      "No Scala version provided to using scala directive"
+    )