Commit f51e897

committed

clean up build.sbt, bring it in line with 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 f51e897Copy full SHA for f51e897

File tree

1 file changed

+13

-5

lines changed

build.sbt

1 file changed

+13

-5

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`

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 f51e897

File tree

1 file changed

1 file changed

`‎build.sbt‎`

0 commit comments