Commit 7e92797

authored

Merge pull request #395 from scala-steward/update/sbt-scalajs-1.6.0

Update sbt-scalajs, ... to 1.6.0

2 parents e4e74c9 + 884cbad commit 7e92797Copy full SHA for 7e92797

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ scala:`
`13`	`13`
`14`	`14`	`env:`
`15`	`15`	`- ADOPTOPENJDK=8 SCALAJS_VERSION= CACHE_WORKAROUND=see-PR-335`
`16`		`- - ADOPTOPENJDK=8 SCALAJS_VERSION=1.5.1 CACHE_WORKAROUND=see-PR-335`
	`16`	`+ - ADOPTOPENJDK=8 SCALAJS_VERSION=1.6.0 CACHE_WORKAROUND=see-PR-335`
`17`	`17`	`- ADOPTOPENJDK=11 SCALAJS_VERSION= CACHE_WORKAROUND=see-PR-335`
`18`	`18`
`19`	`19`	`matrix:`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@ lazy val root = project.in(file("."))`
`3`	`3`	`.settings(`
`4`	`4`	`publish / skip := true,`
`5`	`5`	`ThisBuild / versionScheme := Some("early-semver"),`
`6`		`- ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible`
	`6`	`+ ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible,`
	`7`	`+ // because it doesn't declare it itself`
	`8`	`+ ThisBuild / versionPolicyDependencySchemes += "org.scala-js" %% "scalajs-library" % "semver-spec"`
`7`	`9`	`)`
`8`	`10`
`9`	`11`	`lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatform)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`val scalaJSVersion =`
`2`		`- Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.5.1")`
	`2`	`+ Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.6.0")`
`3`	`3`
`4`	`4`	`val scalaNativeVersion =`
`5`	`5`	`Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.4.0")`

Comments

(0)