Merge pull request #381 from Philippus/issue/380

SethTisue · web-flow · commit a1606f62f8d8 · 2021-05-13T11:56:24.000-07:00
diff --git a/build.sbt b/build.sbt
@@ -89,10 +89,11 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
   )
   .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
   .nativeSettings(
-    compile / skip := System.getProperty("java.version").startsWith("1.6") || !scalaVersion.value.startsWith("3"),
+    scalaModuleMimaPreviousVersion := None, // https://github.com/scala/scala-parser-combinators/pull/381
+    compile / skip := System.getProperty("java.version").startsWith("1.6") || !scalaVersion.value.startsWith("2"),
     test := {},
     libraryDependencies := {
-      if (!scalaVersion.value.startsWith("3"))
+      if (!scalaVersion.value.startsWith("2"))
         libraryDependencies.value.filterNot(_.organization == "org.scala-native")
       else libraryDependencies.value
     }

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,11 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor`
`89`	`89`	`)`
`90`	`90`	`.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))`
`91`	`91`	`.nativeSettings(`
`92`		`- compile / skip := System.getProperty("java.version").startsWith("1.6") \|\| !scalaVersion.value.startsWith("3"),`
	`92`	`+ scalaModuleMimaPreviousVersion := None, // https://github.com/scala/scala-parser-combinators/pull/381`
	`93`	`+ compile / skip := System.getProperty("java.version").startsWith("1.6") \|\| !scalaVersion.value.startsWith("2"),`
`93`	`94`	`test := {},`
`94`	`95`	`libraryDependencies := {`
`95`		`- if (!scalaVersion.value.startsWith("3"))`
	`96`	`+ if (!scalaVersion.value.startsWith("2"))`
`96`	`97`	`libraryDependencies.value.filterNot(_.organization == "org.scala-native")`
`97`	`98`	`else libraryDependencies.value`
`98`	`99`	`}`