clean up build.sbt & build.sh, be more like other modules

in particular, I've come to really dislike .withoutSuffixFor(JVMPlatform),
it makes the root project and the JVM project too easy to confuse with
each other

Author: SethTisue

build.sbt

@@ -1,12 +1,15 @@
-import sbtcrossproject.CrossPlugin.autoImport.crossProject
+lazy val root = project.in(file("."))
+  .aggregate(parserCombinatorsJVM, parserCombinatorsJS, parserCombinatorsNative)
+  .settings(
+    publish / skip := true,
+  )
 
 lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)
-  .withoutSuffixFor(JVMPlatform).in(file("."))
-  .settings(ScalaModulePlugin.scalaModuleSettings)
-  .jvmSettings(ScalaModulePlugin.scalaModuleOsgiSettings)
+  .in(file("."))
   .settings(
+    ScalaModulePlugin.scalaModuleSettings,
     name := "scala-parser-combinators",
-    scalaModuleMimaPreviousVersion := None,
+    scalaModuleMimaPreviousVersion := None,  // until we publish 1.2.0
 
     apiMappings ++= scalaInstance.value.libraryJars.collect {
       case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>
@@ -40,6 +43,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
     }
   )
   .jvmSettings(
+    ScalaModulePlugin.scalaModuleOsgiSettings,
     OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"),
     libraryDependencies += "junit" % "junit" % "4.13.1" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
@@ -59,3 +63,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
       else libraryDependencies.value
     }
   )
+
+lazy val parserCombinatorsJVM    = parserCombinators.jvm
+lazy val parserCombinatorsJS     = parserCombinators.js
+lazy val parserCombinatorsNative = parserCombinators.native

build.sh

@@ -16,21 +16,21 @@ set -e
 # - commit the changes and tag this new revision with an arbitrary suffix after a hash, e.g.,
 #   `v1.2.3#dotty-0.27` (the suffix is ignored, the version will be `1.2.3`)
 
-# For normal tags that are cross-built, we release on JDK 8 for Scala 2.x
+# We release on JDK 8 (for Scala 2.x and Dotty 0.x)
 isReleaseJob() {
-  if [[ "$ADOPTOPENJDK" == "8" && "$TRAVIS_SCALA_VERSION" =~ ^2\.1[01234]\..*$ ]]; then
+  if [[ "$ADOPTOPENJDK" == "8" ]]; then
     true
   else
     false
   fi
 }
 
 if [[ "$SCALAJS_VERSION" != "" ]]; then
-  projectPrefix="parserCombinatorsJS"
+  projectPrefix="parserCombinatorsJS/"
 elif [[ "$SCALANATIVE_VERSION" != "" ]]; then
-  projectPrefix="parserCombinatorsNative"
+  projectPrefix="parserCombinatorsNative/"
 else
-  projectPrefix="parserCombinators"
+  projectPrefix="parserCombinatorsJVM/"
 fi
 
 verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
@@ -45,12 +45,12 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
 fi
 
 # default is +publishSigned; we cross-build with travis jobs, not sbt's crossScalaVersions
-export CI_RELEASE="$projectPrefix/publishSigned"
-export CI_SNAPSHOT_RELEASE="$projectPrefix/publish"
+export CI_RELEASE="${projectPrefix}publishSigned"
+export CI_SNAPSHOT_RELEASE="${projectPrefix}publish"
 
 # default is sonatypeBundleRelease, which closes and releases the staging repo
 # see https://github.com/xerial/sbt-sonatype#commands
 # for now, until we're confident in the new release scripts, just close the staging repo.
 export CI_SONATYPE_RELEASE="; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
 
-sbt clean $projectPrefix/test $projectPrefix/publishLocal $releaseTask
+sbt clean ${projectPrefix}test ${projectPrefix}publishLocal $releaseTask