Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 37c1454

Browse files
author
exoego
committed
Prepare Scala.js cross publishing
1 parent bdf6fb7 commit 37c1454

File tree

5 files changed

+23
-8
lines changed

5 files changed

+23
-8
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ jdk:
99
- openjdk11
1010

1111
env:
12-
- TRAVIS_NODE_VERSION="12.16.1" JOB_NAME="test"
12+
global:
13+
- TRAVIS_NODE_VERSION="12.16.1" JOB_NAME="test"
14+
matrix:
15+
- SCALAJS_VERSION="0.6.32"
16+
- SCALAJS_VERSION="1.0.0"
1317

1418
script:
1519
- sbt ++$TRAVIS_SCALA_VERSION test

project/Dependencies.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@ import sbt.Keys._
33
import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
44

55
object Dependencies {
6-
val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value)
6+
val scalaReflect = Def.setting("org.scala-lang" % "scala-reflect" % scalaVersion.value)
7+
val scalatestVersion = "3.1.1"
78

89
val core = Def.setting(
910
Seq(
1011
scalaReflect.value,
11-
"org.scalatest" %%% "scalatest" % "3.1.0" % "test"
12+
"org.scalatest" %%% "scalatest" % scalatestVersion % "test"
1213
)
1314
)
1415

1516
val app = Def.setting(
1617
Seq(
1718
scalaReflect.value,
18-
"org.scalatest" %%% "scalatest" % "3.1.0" % "test",
19+
"org.scalatest" %%% "scalatest" % scalatestVersion % "test",
1920
"com.thoughtworks.enableIf" %% "enableif" % "1.1.7"
2021
)
2122
)

project/MySettings.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import org.scalajs.sbtplugin.ScalaJSPlugin.AutoImport.{ModuleKind, scalaJSModuleKind}
1+
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
22
import sbt._
33
import sbt.Keys._
44
import sbtrelease.ReleasePlugin.autoImport._
@@ -56,8 +56,12 @@ object MySettings {
5656
)
5757

5858
lazy val commonScalaJsSettings = Seq(
59-
scalacOptions += "-P:scalajs:sjsDefinedByDefault",
60-
scalaJSModuleKind := ModuleKind.CommonJSModule,
59+
scalacOptions ++= Seq("-P:scalajs:sjsDefinedByDefault").filter { _ =>
60+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0").startsWith("0.6.")
61+
},
62+
scalaJSLinkerConfig ~= {
63+
_.withModuleKind(ModuleKind.CommonJSModule)
64+
},
6165
logBuffered in Test := true
6266
)
6367

project/plugins.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
1+
val scalaJSVersion =
2+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
3+
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
25
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.1")
36
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
47
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")

script/release.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env node
2+
3+
console.log("AYY! !");

0 commit comments

Comments
 (0)