Skip to content

Commit 6d36abc

Browse files
Use sbt-coursier to circumvent suspicious version selection in plugins
1 parent 5a002e5 commit 6d36abc

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: scala
22
sudo: required
33
dist: trusty
44
script:
5+
- if [[ ${SCALAJS_VERSION} = 1.* ]]; then mv project/ScalaJS1Settings.scala.0 project/ScalaJS1Settings.scala; fi
56
# plz is like ++ except it skips projects that are not defined for that scala version.
67
- sbt "plz $TRAVIS_SCALA_VERSION test"
78
jdk:

build.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ lazy val sourcecode = crossProject(JSPlatform, JVMPlatform, NativePlatform)
6666
)
6767
.enablePlugins(SbtOsgi)
6868
.jsSettings(
69-
scalaJSUseMainModuleInitializer in Test := true, // use JVM-style main.
70-
scalaJSUseTestModuleInitializer in Test := false // seems required with scala-js 1.0.0-M5
69+
scalaJSUseMainModuleInitializer in Test := true // use JVM-style main.
7170
)
7271
.nativeSettings(
7372
crossScalaVersions := Seq(scala211)

project/ScalaJS1Settings.scala.0

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import sbt._
2+
object ScalaJS1Settings extends AutoPlugin {
3+
override def requires = org.scalajs.sbtplugin.ScalaJSPlugin
4+
override def trigger = allRequirements
5+
override def projectSettings = Seq(
6+
// seems required with scala-js 1.0.0-M5
7+
org.scalajs.sbtplugin.ScalaJSPlugin.autoImport.scalaJSUseTestModuleInitializer in Test := false
8+
)
9+
}

project/build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.8.0")
99
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0")
1010
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.3.8")
1111
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0")
12+
13+
addSbtCoursier

project/project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.3")

0 commit comments

Comments
 (0)