Commit de2d168

committed

Don't check for scala versions anymore for scala native

1 parent c287698 commit de2d168Copy full SHA for de2d168

File tree

1 file changed

-9

lines changed

build.sbt

1 file changed

-9

lines changed

`‎build.sbt‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,12 @@ ThisBuild / startYear := Some(2004)`
`4`	`4`	// I thought we could declare these in `ThisBuild` scope but no :-/
`5`	`5`	`val commonSettings = Seq(`
`6`	`6`	`versionScheme := Some("early-semver"),`
`7`		`- versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,`
	`7`	`+ versionPolicyIntention := {`
	`8`	`+ if (scalaVersion.value.startsWith("3"))`
	`9`	`+ Compatibility.None`
	`10`	`+ else`
	`11`	`+ Compatibility.BinaryAndSourceCompatible`
	`12`	`+ }`
`8`	`13`	`)`
`9`	`14`
`10`	`15`	`lazy val root = project.in(file("."))`
`@@ -22,7 +27,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor`
`22`	`27`	`name := "scala-parser-combinators",`
`23`	`28`	`scalaModuleAutomaticModuleName := Some("scala.util.parsing"),`
`24`	`29`
`25`		`- crossScalaVersions := Seq("2.13.8", "2.12.15", "2.11.12", "3.0.2"),`
	`30`	`+ crossScalaVersions := Seq("2.13.8", "2.12.15", "2.11.12", "3.1.1"),`
`26`	`31`	`scalaVersion := crossScalaVersions.value.head,`
`27`	`32`
`28`	`33`	`libraryDependencies += "junit" % "junit" % "4.13.2" % Test,`
`@@ -99,13 +104,8 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor`
`99`	`104`	`.nativeSettings(`
`100`	`105`	`versionPolicyCheck / skip := true,`
`101`	`106`	`versionCheck / skip := true,`
`102`		`- compile / skip := System.getProperty("java.version").startsWith("1.6") \|\| !scalaVersion.value.startsWith("2"),`
`103`		`- test := {},`
`104`		`- libraryDependencies := {`
`105`		`- if (!scalaVersion.value.startsWith("2"))`
`106`		`- libraryDependencies.value.filterNot(_.organization == "org.scala-native")`
`107`		`- else libraryDependencies.value`
`108`		`- }`
	`107`	`+ compile / skip := System.getProperty("java.version").startsWith("1.6"),`
	`108`	`+ test := {}`
`109`	`109`	`)`
`110`	`110`
`111`	`111`	`lazy val parserCombinatorsJVM = parserCombinators.jvm`

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 de2d168

File tree

1 file changed

1 file changed

`‎build.sbt‎`

0 commit comments