@@ -19,10 +19,15 @@ lazy val root = project.in(file("."))
19
19
20
20
lazy val `scala-parser-combinators` = crossProject.in(file(" ." )).
21
21
settings(scalaModuleSettings : _* ).
22
+ jvmSettings(scalaModuleSettingsJVM).
22
23
settings(
23
- name := " scala-parser-combinators-root" ,
24
+ repoName := " scala-parser-combinators" ,
25
+ version := " 1.0.7-SNAPSHOT" ,
26
+ mimaPreviousVersion := Some (" 1.0.5" ),
27
+
24
28
apiMappings += (scalaInstance.value.libraryJar ->
25
29
url(s " https://www.scala-lang.org/api/ ${scalaVersion.value}/ " )),
30
+
26
31
scalacOptions in (Compile , doc) ++= Seq (
27
32
" -diagrams" ,
28
33
" -doc-source-url" ,
@@ -36,32 +41,15 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")).
36
41
)
37
42
).
38
43
jvmSettings(
39
- // Mima uses the name of the jvm project in the artifactId
40
- // when resolving previous versions (so no "-jvm" project)
41
- name := " scala-parser-combinators"
42
- ).
43
- jsSettings(
44
- name := " scala-parser-combinators-js"
45
- ).
46
- settings(
47
- moduleName := " scala-parser-combinators" ,
48
- version := " 1.0.7-SNAPSHOT"
49
- ).
50
- jvmSettings(
51
- OsgiKeys .exportPackage := Seq (s " scala.util.parsing.*;version= ${version.value}" )
44
+ OsgiKeys .exportPackage := Seq (s " scala.util.parsing.*;version= ${version.value}" ),
45
+ libraryDependencies += " junit" % " junit" % " 4.12" % " test" ,
46
+ libraryDependencies += " com.novocode" % " junit-interface" % " 0.11" % " test"
52
47
).
53
48
jsSettings(
54
49
// Scala.js cannot run forked tests
55
50
fork in Test := false
56
51
).
57
- jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin )).
58
- jvmSettings(
59
- libraryDependencies += " junit" % " junit" % " 4.12" % " test" ,
60
- libraryDependencies += " com.novocode" % " junit-interface" % " 0.11" % " test"
61
- ).
62
- jvmSettings(
63
- mimaPreviousVersion := Some (" 1.0.4" )
64
- )
52
+ jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin ))
65
53
66
54
lazy val `scala-parser-combinatorsJVM` = `scala-parser-combinators`.jvm
67
55
lazy val `scala-parser-combinatorsJS` = `scala-parser-combinators`.js
0 commit comments