Skip to content

Commit 3fc2353

Browse files
committed
drop javascript to fix publishing of jar
addresses scala#51 other attempt doesn't fully work, see scala#63 (comment)
1 parent c7bcc3b commit 3fc2353

File tree

2 files changed

+16
-40
lines changed

2 files changed

+16
-40
lines changed

build.sbt

+15-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
1-
import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject}
1+
name := "scala-collection-contrib"
2+
organization := "com.michaelpollmeier"
3+
scalaVersion := "2.13.1"
4+
enablePlugins(GitVersioning)
25

3-
// With CrossType.Pure, the root project also picks up the sources in `src`
4-
Compile/sources := Nil
5-
Test/sources := Nil
6+
scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings")
7+
scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups")
8+
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a")
9+
parallelExecution in Test := false // why?
10+
libraryDependencies ++= Seq(
11+
"junit" % "junit" % "4.12" % Test,
12+
"com.novocode" % "junit-interface" % "0.11" % Test,
13+
"org.openjdk.jol" % "jol-core" % "0.9" % Test
14+
)
615

7-
lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
8-
.withoutSuffixFor(JVMPlatform)
9-
.crossType(CrossType.Pure)
10-
.in(file("."))
11-
.settings(ScalaModulePlugin.scalaModuleSettings)
12-
.jvmSettings(ScalaModulePlugin.scalaModuleSettingsJVM)
13-
.settings(
14-
name := "scala-collection-contrib",
15-
scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings"),
16-
scalacOptions in (Compile, doc) ++= Seq("-implicits", "-groups"),
17-
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"),
18-
parallelExecution in Test := false, // why?
19-
libraryDependencies ++= Seq(
20-
"junit" % "junit" % "4.12" % Test,
21-
"com.novocode" % "junit-interface" % "0.11" % Test,
22-
"org.openjdk.jol" % "jol-core" % "0.9" % Test
23-
)
24-
)
25-
.jvmSettings(
26-
scalaModuleMimaPreviousVersion := Some("0.1.0"), // why only in jvmSettings?
27-
// TODO: osgi settings; not trivial because of split packages.
28-
// See https://github.com/scala/scala-collection-compat/pull/226
29-
// OsgiKeys.exportPackage := Seq(s"scala.collection.*;version=${version.value}"),
30-
)
31-
.jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
32-
.jsSettings(
33-
// Scala.js cannot run forked tests
34-
fork in Test := false
35-
)
16+
bintrayVcsUrl := Some("https://github.com/mpollmeier/scala-collection-contrib")
17+
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0"))

project/plugins.sbt

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.29")
3-
4-
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.1.2")
5-
6-
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")
7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1+
addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "1.1.14")

0 commit comments

Comments
 (0)