Commit 5453050

committed

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

1 parent 94a66be commit 5453050Copy full SHA for 5453050

File tree

2 files changed

+21

-13

lines changed

build.sbt
build.sh

2 files changed

+21

-13

lines changed

`‎build.sbt‎`

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`		`-import sbtcrossproject.CrossPlugin.autoImport.crossProject`
	`1`	`+lazy val root = project.in(file("."))`
	`2`	`+ .aggregate(parserCombinatorsJVM, parserCombinatorsJS, parserCombinatorsNative)`
	`3`	`+ .settings(`
	`4`	`+ publish / skip := true,`
	`5`	`+ )`
`2`	`6`
`3`	`7`	`lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)`
`4`		`- .withoutSuffixFor(JVMPlatform).in(file("."))`
`5`		`- .settings(ScalaModulePlugin.scalaModuleSettings)`
`6`		`- .jvmSettings(ScalaModulePlugin.scalaModuleOsgiSettings)`
	`8`	`+ .in(file("."))`
`7`	`9`	`.settings(`
	`10`	`+ ScalaModulePlugin.scalaModuleSettings,`
`8`	`11`	`name := "scala-parser-combinators",`
`9`		`- scalaModuleMimaPreviousVersion := None,`
	`12`	`+ scalaModuleMimaPreviousVersion := None,// until we publish 1.2.0`
`10`	`13`
`11`	`14`	`apiMappings ++= scalaInstance.value.libraryJars.collect {`
`12`	`15`	`case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>`
`@@ -40,6 +43,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor`
`40`	`43`	`}`
`41`	`44`	`)`
`42`	`45`	`.jvmSettings(`
	`46`	`+ ScalaModulePlugin.scalaModuleOsgiSettings,`
`43`	`47`	`OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"),`
`44`	`48`	`libraryDependencies += "junit" % "junit" % "4.13.1" % Test,`
`45`	`49`	`libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test`
`@@ -59,3 +63,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor`
`59`	`63`	`else libraryDependencies.value`
`60`	`64`	`}`
`61`	`65`	`)`
	`66`	`+`
	`67`	`+lazy val parserCombinatorsJVM = parserCombinators.jvm`
	`68`	`+lazy val parserCombinatorsJS = parserCombinators.js`
	`69`	`+lazy val parserCombinatorsNative = parserCombinators.native`

`‎build.sh‎`

Lines changed: 8 additions & 8 deletions

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

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5453050

File tree

2 files changed

2 files changed

`‎build.sbt‎`

`‎build.sh‎`

0 commit comments